Author: schor Date: Tue Dec 4 16:09:53 2018 New Revision: 1848164 URL: http://svn.apache.org/viewvc?rev=1848164&view=rev Log: [UIMA-5922] remove unnecessary boxing / unboxing
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Obj2IntIdentityHashMapTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/DescriptorMakeUtil.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCasConsumer.java uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestCollectionReader.java uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityFeatureDialog.java uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddCapabilityTypeDialog.java uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddFeatureDialog.java uima/uv3/uimaj-v3/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/ConfigField.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/MetaDataPanel.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/IntegerField.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/gui/SliderField.java uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java (original) +++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/Service.java Tue Dec 4 16:09:53 2018 @@ -107,7 +107,7 @@ public class Service implements ServiceI return (qhost = getHostByAddr(host)); if (name.equals("instance")) - return new Integer(instance); + return instance; if (name.equals("level")) { if (level == null || level.equals("")) @@ -162,10 +162,10 @@ public class Service implements ServiceI dict.put("LEVEL", level); if (realhost != null) dict.put("IP", realhost); - dict.put("INSTANCE", new Integer(instance)); - dict.put("MINPORT", new Integer(minport)); - dict.put("MAXPORT", new Integer(maxport)); - dict.put("PORT", new Integer(port)); + dict.put("INSTANCE", instance); + dict.put("MINPORT", minport); + dict.put("MAXPORT", maxport); + dict.put("PORT", port); dict.put("IP", getHostByName(host)); } Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java (original) +++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/VNS.java Tue Dec 4 16:09:53 2018 @@ -1253,8 +1253,8 @@ public class VNS extends VinciServableAd synchronized (hits) { Integer I = (Integer) hits.get(type); if (I == null) - I = new Integer(0); - I = new Integer(I.intValue() + 1); + I = 0; + I = I + 1; hits.put(type, I); totalhits++; Modified: uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java Tue Dec 4 16:09:53 2018 @@ -141,7 +141,7 @@ public class AxisResourceServiceManager // create and initialize the service implementation serviceImpl = (ResourceService_impl) aServiceImplClass.newInstance(); HashMap initParams = new HashMap(); - initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, new Integer(numInstances)); + initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, numInstances); serviceImpl.initialize(resourceSpecifier, initParams); // disable logging for Analysis Engines if deployer so indicated Modified: uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java Tue Dec 4 16:09:53 2018 @@ -146,7 +146,7 @@ public class VinciAnalysisEngineServiceS //store timeout for use in later RPC calls if (timeout != null) { - mTimeout = timeout.intValue(); + mTimeout = timeout; } else { mTimeout = mVinciClient.getSocketTimeout(); //default } Modified: uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java Tue Dec 4 16:09:53 2018 @@ -138,7 +138,7 @@ public class VinciBinaryAnalysisEngineSe //store timeout for use in later RPC calls if (timeout != null) { - mTimeout = timeout.intValue(); + mTimeout = timeout; } else { mTimeout = mVinciClient.getSocketTimeout(); //default } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java Tue Dec 4 16:09:53 2018 @@ -497,9 +497,8 @@ public abstract class UIMAFramework { // add parameters to the aAdditionalParams map Map<String, Object> aAdditionalParams = new HashMap<>(); - aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf( - aMaxSimultaneousRequests)); - aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeoutPeriod)); + aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, aMaxSimultaneousRequests); + aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, aTimeoutPeriod); AnalysisEngine ae = null; // Fetch current time to compute initialization time @@ -650,9 +649,8 @@ public abstract class UIMAFramework { // add parameters to the aAdditionalParams map Map<String, Object> aAdditionalParams = new HashMap<>(); - aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf( - aMaxSimultaneousRequests)); - aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeoutPeriod)); + aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, aMaxSimultaneousRequests); + aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, aTimeoutPeriod); return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier, aAdditionalParams); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java Tue Dec 4 16:09:53 2018 @@ -101,11 +101,11 @@ public class MultiprocessingAnalysisEngi // determine size of Analysis Engine pool and timeout period Integer poolSizeInteger = (Integer) aAdditionalParams.get(PARAM_NUM_SIMULTANEOUS_REQUESTS); - int poolSize = (poolSizeInteger != null) ? poolSizeInteger.intValue() + int poolSize = (poolSizeInteger != null) ? poolSizeInteger : DEFAULT_NUM_SIMULTANEOUS_REQUESTS; Integer timeoutInteger = (Integer) aAdditionalParams.get(PARAM_TIMEOUT_PERIOD); - mTimeout = (timeoutInteger != null) ? timeoutInteger.intValue() : DEFAULT_TIMEOUT_PERIOD; + mTimeout = (timeoutInteger != null) ? timeoutInteger : DEFAULT_TIMEOUT_PERIOD; // Share resource manager, but don't share uima-context // // add UimaContext to params map so that all AEs in pool will share it @@ -127,7 +127,7 @@ public class MultiprocessingAnalysisEngi AnalysisEngine ae = mPool.getAnalysisEngine(mTimeout); if (ae == null) { // timeout elapsed throw new AnalysisEngineProcessException(AnalysisEngineProcessException.TIMEOUT_ELAPSED, - new Object[] { Integer.valueOf(getTimeout()) }); + new Object[] {getTimeout()}); } return ae; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java Tue Dec 4 16:09:53 2018 @@ -64,14 +64,14 @@ public class AnalysisEngineService_impl Integer numInstances = (Integer) aResourceInitParams .get(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS); if (numInstances == null) { - numInstances = Integer.valueOf(1); + numInstances = 1; } - mCasPool = new CasPool(numInstances.intValue(), getAnalysisEngine()); + mCasPool = new CasPool(numInstances, getAnalysisEngine()); // also record timeout period to use for CAS pool Integer timeoutInteger = (Integer) aResourceInitParams.get(AnalysisEngine.PARAM_TIMEOUT_PERIOD); if (timeoutInteger != null) { - mTimeout = timeoutInteger.intValue(); + mTimeout = timeoutInteger; } else { mTimeout = 0; } @@ -88,9 +88,8 @@ public class AnalysisEngineService_impl public void initialize(ResourceSpecifier aResourceSpecifier, int aNumSimultaneousRequests, int aTimeout) throws ResourceInitializationException { Map<String, Object> initParams = new HashMap<>(); - initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf( - aNumSimultaneousRequests)); - initParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeout)); + initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, aNumSimultaneousRequests); + initParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, aTimeout); this.initialize(aResourceSpecifier, initParams); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java Tue Dec 4 16:09:53 2018 @@ -562,7 +562,7 @@ public class BinaryCasSerDes { if (h.isCompressed) { if (TRACE_DESER) { - System.out.format("BinDeser version = %d%n", Integer.valueOf(h.v)); + System.out.format("BinDeser version = %d%n", h.v); } if (h.form4) { BinaryCasSerDes4 bcsd4 = new BinaryCasSerDes4(baseCas.getTypeSystemImpl(), false); @@ -703,7 +703,7 @@ public class BinaryCasSerDes { } if (TRACE_DESER) { System.out.format("BinDes Plain %s startPos: %,d mainHeapSize: %d%n", - delta ? "Delta" : "", Integer.valueOf(startPos), Integer.valueOf(fsheapsz)); + delta ? "Delta" : "", startPos, fsheapsz); } // add new heap slots @@ -778,7 +778,7 @@ public class BinaryCasSerDes { modWords[i] = r.readInt(); } if (TRACE_DESER) { - System.out.format("BinDes modified heap slot count: %,d%n", Integer.valueOf(fsmodssz2 / 2)); + System.out.format("BinDes modified heap slot count: %,d%n", fsmodssz2 / 2); } } else { fsmodssz2 = 0; // not used but must be set to make "final" work @@ -789,19 +789,19 @@ public class BinaryCasSerDes { // indexed FSs int fsindexsz = r.readInt(); int[] fsindexes = new int[fsindexsz]; - if (TRACE_DESER) System.out.format("BinDes indexedFSs count: %,d%n", Integer.valueOf(fsindexsz)); + if (TRACE_DESER) System.out.format("BinDes indexedFSs count: %,d%n", fsindexsz); for (int i = 0; i < fsindexsz; i++) { fsindexes[i] = r.readInt(); if (TRACE_DESER) { - if (i % 5 == 0) System.out.format("%n i: %5d ", Integer.valueOf(i)); - System.out.format("%15d ", Integer.valueOf(fsindexes[i])); + if (i % 5 == 0) System.out.format("%n i: %5d ", i); + System.out.format("%15d ", fsindexes[i]); } } if (TRACE_DESER) System.out.println(""); // byte heap int heapsz = r.readInt(); - if (TRACE_DESER) System.out.format("BinDes ByteHeap size: %,d%n", Integer.valueOf(heapsz)); + if (TRACE_DESER) System.out.format("BinDes ByteHeap size: %,d%n", heapsz); if (!delta) { byteHeap.heap = new byte[Math.max(16, heapsz)]; // must be > 0 @@ -817,7 +817,7 @@ public class BinaryCasSerDes { // short heap heapsz = r.readInt(); - if (TRACE_DESER) System.out.format("BinDes ShortHeap size: %,d%n", Integer.valueOf(heapsz)); + if (TRACE_DESER) System.out.format("BinDes ShortHeap size: %,d%n", heapsz); if (!delta) { shortHeap.heap = new short[Math.max(16, heapsz)]; // must be > 0 @@ -839,7 +839,7 @@ public class BinaryCasSerDes { // long heap heapsz = r.readInt(); - if (TRACE_DESER) System.out.format("BinDes LongHeap size: %,d%n", Integer.valueOf(heapsz)); + if (TRACE_DESER) System.out.format("BinDes LongHeap size: %,d%n", heapsz); if (!delta) { longHeap.heap = new long[Math.max(16, heapsz)]; // must be > 0 @@ -1612,7 +1612,7 @@ public class BinaryCasSerDes { // } type = tsi.getTypeForCode(heap.heap[heapIndex]); if (type == null) { - throw new CASRuntimeException(CASRuntimeException.deserialized_type_not_found, Integer.valueOf(heap.heap[heapIndex])); + throw new CASRuntimeException(CASRuntimeException.deserialized_type_not_found, heap.heap[heapIndex]); } if (type.isArray()) { final int len = heap.heap[heapIndex + arrayLengthFeatOffset]; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java Tue Dec 4 16:09:53 2018 @@ -920,14 +920,14 @@ public class BinaryCasSerDes4 implements DeflaterOutputStream cds = new DeflaterOutputStream(baosZipped, deflater, zipBufSize); baos.writeTo(cds); cds.close(); - idxAndLen.add(Integer.valueOf(i)); + idxAndLen.add(i); if (doMeasurement) { - idxAndLen.add(Integer.valueOf((int)(sm.statDetails[i].afterZip = deflater.getBytesWritten()))); - idxAndLen.add(Integer.valueOf((int)(sm.statDetails[i].beforeZip = deflater.getBytesRead()))); + idxAndLen.add((int) (sm.statDetails[i].afterZip = deflater.getBytesWritten())); + idxAndLen.add((int) (sm.statDetails[i].beforeZip = deflater.getBytesRead())); sm.statDetails[i].zipTime = System.currentTimeMillis() - startTime; } else { - idxAndLen.add(Integer.valueOf((int)deflater.getBytesWritten())); - idxAndLen.add(Integer.valueOf((int)deflater.getBytesRead())); + idxAndLen.add((int) deflater.getBytesWritten()); + idxAndLen.add((int) deflater.getBytesRead()); } } } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Tue Dec 4 16:09:53 2018 @@ -2614,10 +2614,10 @@ public JCasImpl getJCasImpl() { private final void checkTypeHasFeature(TypeImpl domainType, FeatureImpl feature) { if (!domainType.isAppropriateFeature(feature)) { - throw new LowLevelException(LowLevelException.FEAT_DOM_ERROR, - Integer.valueOf(domainType.getCode()), + throw new LowLevelException(LowLevelException.FEAT_DOM_ERROR, + domainType.getCode(), domainType.getName(), - Integer.valueOf(feature.getCode()), + feature.getCode(), feature.getName()); } } @@ -2638,9 +2638,9 @@ public JCasImpl getJCasImpl() { checkTypeHasFeature(domainTi, fi); if (!((TypeImpl) fi.getRange()).subsumes((TypeImpl) ranType)) { throw new LowLevelException(LowLevelException.FEAT_RAN_ERROR, - Integer.valueOf(fi.getCode()), + fi.getCode(), feat.getName(), - Integer.valueOf(((TypeImpl)ranType).getCode()), + ((TypeImpl) ranType).getCode(), ranType.getName()); } } @@ -2654,7 +2654,7 @@ public JCasImpl getJCasImpl() { private final void checkFsRan(FeatureImpl fi) throws LowLevelException { if (!fi.getRangeImpl().isRefType) { throw new LowLevelException(LowLevelException.FS_RAN_TYPE_ERROR, - Integer.valueOf(fi.getCode()), + fi.getCode(), fi.getName(), fi.getRange().getName()); } @@ -2662,7 +2662,7 @@ public JCasImpl getJCasImpl() { private final void checkFeature(int featureCode) { if (!getTypeSystemImpl().isFeature(featureCode)) { - throw new LowLevelException(LowLevelException.INVALID_FEATURE_CODE, Integer.valueOf(featureCode)); + throw new LowLevelException(LowLevelException.INVALID_FEATURE_CODE, featureCode); } } @@ -2684,7 +2684,7 @@ public JCasImpl getJCasImpl() { if (fsRef == 0) { return null; } - LowLevelException e = new LowLevelException(LowLevelException.INVALID_FS_REF, Integer.valueOf(fsRef)); + LowLevelException e = new LowLevelException(LowLevelException.INVALID_FS_REF, fsRef); // this form to enable seeing this even if the // throwable is silently handled. // System.err.println("debug " + e); @@ -2714,7 +2714,7 @@ public JCasImpl getJCasImpl() { TypeImpl ti = (TypeImpl) getTypeSystemImpl().ll_getTypeForCode(typeCode); if (doCheck) { if (ti == null || !ti.isCreatableAndNotBuiltinArray()) { - throw new LowLevelException(LowLevelException.CREATE_FS_OF_TYPE_ERROR, Integer.valueOf(typeCode)); + throw new LowLevelException(LowLevelException.CREATE_FS_OF_TYPE_ERROR, typeCode); } } TOP fs = (TOP) createFS(ti); @@ -2835,10 +2835,10 @@ public JCasImpl getJCasImpl() { TypeImpl ti = getTypeFromCode_checked(typeCode); if (doChecks) { if (!ti.isArray()) { - throw new LowLevelException(LowLevelException.CREATE_ARRAY_OF_TYPE_ERROR, Integer.valueOf(typeCode), ti.getName()); + throw new LowLevelException(LowLevelException.CREATE_ARRAY_OF_TYPE_ERROR, typeCode, ti.getName()); } if (arrayLength < 0) { - throw new LowLevelException(LowLevelException.ILLEGAL_ARRAY_LENGTH, Integer.valueOf(arrayLength)); + throw new LowLevelException(LowLevelException.ILLEGAL_ARRAY_LENGTH, arrayLength); } } TOP fs = createArray(ti, arrayLength); @@ -3585,8 +3585,8 @@ public JCasImpl getJCasImpl() { private void throwAccessTypeError(int fsRef, int typeCode) { throw new LowLevelException(LowLevelException.ACCESS_TYPE_ERROR, - Integer.valueOf(fsRef), - Integer.valueOf(typeCode), + fsRef, + typeCode, getTypeSystemImpl().ll_getTypeForCode(typeCode).getName(), getTypeSystemImpl().ll_getTypeForCode(ll_getFSRefType(fsRef)).getName()); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java Tue Dec 4 16:09:53 2018 @@ -1286,7 +1286,7 @@ public class CasCompare { Pair<TOP, TOP> refs = new Pair<>(rfs1, rfs2); Integer prevComp = prevCompare.get(refs); if (prevComp != null) { - int v = prevComp.intValue(); + int v = prevComp; if (v == 0) { return compareRefResult(rfs1, rfs2); // stop recursion, return based on loops } else { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java Tue Dec 4 16:09:53 2018 @@ -157,9 +157,9 @@ public class CommonSerDesSequential { for (TOP fs : filtered) { addFS1(fs, nextAddr); // doesn't update sortedFSs, that will be done below in batch if (TRACE_SETUP) { - System.out.format("Cmn serDes sequential setup: add FS id: %,4d addr: %,5d type: %s%n", - Integer.valueOf(fs._id), - Integer.valueOf(nextAddr), + System.out.format("Cmn serDes sequential setup: add FS id: %,4d addr: %,5d type: %s%n", + fs._id, + nextAddr, fs._getTypeImpl().getShortName()); } nextAddr += BinaryCasSerDes.getFsSpaceReq(fs, fs._getTypeImpl()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java Tue Dec 4 16:09:53 2018 @@ -286,19 +286,19 @@ public class DebugFSLogicalStructure { DebugNameValuePair nv = new DebugNameValuePair(feat.getShortName(), null); String rangeTypeName = feat.getRange().getName(); if ("uima.cas.Integer".equals(rangeTypeName)) - nv.setValue(Integer.valueOf(fs.getIntValue(feat))); + nv.setValue(fs.getIntValue(feat)); else if ("uima.cas.Float".equals(rangeTypeName)) - nv.setValue(Float.valueOf(fs.getFloatValue(feat))); + nv.setValue(fs.getFloatValue(feat)); else if ("uima.cas.Boolean".equals(rangeTypeName)) - nv.setValue(Boolean.valueOf(fs.getBooleanValue(feat))); + nv.setValue(fs.getBooleanValue(feat)); else if ("uima.cas.Byte".equals(rangeTypeName)) - nv.setValue(Byte.valueOf(fs.getByteValue(feat))); + nv.setValue(fs.getByteValue(feat)); else if ("uima.cas.Short".equals(rangeTypeName)) - nv.setValue(Short.valueOf(fs.getShortValue(feat))); + nv.setValue(fs.getShortValue(feat)); else if ("uima.cas.Long".equals(rangeTypeName)) - nv.setValue(Long.valueOf(fs.getLongValue(feat))); + nv.setValue(fs.getLongValue(feat)); else if ("uima.cas.Double".equals(rangeTypeName)) - nv.setValue(Double.valueOf(fs.getDoubleValue(feat))); + nv.setValue(fs.getDoubleValue(feat)); else if ("uima.cas.String".equals(rangeTypeName)) nv.setValue(fs.getStringValue(feat)); else @@ -454,7 +454,7 @@ public class DebugFSLogicalStructure { Set<FeatureStructure> alreadySeen = new HashSet<>(); FeatureStructure nextFs; for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) { - list.add(Float.valueOf(currentFs.getFloatValue(headFeature))); + list.add(currentFs.getFloatValue(headFeature)); nextFs = currentFs.getFeatureValue(tailFeature); if (alreadySeen.contains(nextFs)) { return loopInList(list); @@ -463,7 +463,7 @@ public class DebugFSLogicalStructure { } float[] floatArray = new float[list.size()]; for (int i = 0; i < floatArray.length; i++) { - floatArray[i] = list.get(i).floatValue(); + floatArray[i] = list.get(i); } return floatArray; } @@ -478,7 +478,7 @@ public class DebugFSLogicalStructure { Set<FeatureStructure> alreadySeen = new HashSet<>(); FeatureStructure nextFs; for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) { - list.add(Integer.valueOf(currentFs.getIntValue(headFeature))); + list.add(currentFs.getIntValue(headFeature)); nextFs = currentFs.getFeatureValue(tailFeature); if (alreadySeen.contains(nextFs)) { return loopInList(list); @@ -487,7 +487,7 @@ public class DebugFSLogicalStructure { } int[] intArray = new int[list.size()]; for (int i = 0; i < intArray.length; i++) { - intArray[i] = list.get(i).intValue(); + intArray[i] = list.get(i); } return intArray; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java Tue Dec 4 16:09:53 2018 @@ -1243,9 +1243,9 @@ public abstract class FSClassRegistry { add2errors(errorSet, new CASRuntimeException(CASRuntimeException.JCAS_FIELD_ADJ_OFFSET_CHANGED, clazz.getName(), - fi.getName(), - Integer.valueOf(staticOffsetInClass), - Integer.valueOf(fi.getAdjustedOffset())), + fi.getName(), + staticOffsetInClass, + fi.getAdjustedOffset()), staticOffsetInClass != -1); // throw unless static offset is -1, in that case, a runtime error will occur if it is usedd } // end of offset changed } // end of feature check Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java Tue Dec 4 16:09:53 2018 @@ -59,31 +59,31 @@ class FSFloatConstraintImpl implements F for (int i = 0; i < max; i++) { switch (this.codes.get(i)) { case LT: { - if (f >= (this.values.get(i)).floatValue()) { + if (f >= this.values.get(i)) { return false; } break; } case LEQ: { - if (f > (this.values.get(i)).floatValue()) { + if (f > this.values.get(i)) { return false; } break; } case EQ: { - if (f != (this.values.get(i)).floatValue()) { + if (f != this.values.get(i)) { return false; } break; } case GEQ: { - if (f < (this.values.get(i)).floatValue()) { + if (f < this.values.get(i)) { return false; } break; } case GT: { - if (f <= (this.values.get(i)).floatValue()) { + if (f <= this.values.get(i)) { return false; } break; @@ -106,7 +106,7 @@ class FSFloatConstraintImpl implements F @Override public void eq(float f) { this.codes.add(EQ); - this.values.add(Float.valueOf(f)); + this.values.add(f); } /** @@ -118,7 +118,7 @@ class FSFloatConstraintImpl implements F @Override public void lt(float f) { this.codes.add(LT); - this.values.add(Float.valueOf(f)); + this.values.add(f); } /** @@ -130,7 +130,7 @@ class FSFloatConstraintImpl implements F @Override public void leq(float f) { this.codes.add(LEQ); - this.values.add(Float.valueOf(f)); + this.values.add(f); } /** @@ -142,7 +142,7 @@ class FSFloatConstraintImpl implements F @Override public void gt(float f) { this.codes.add(GT); - this.values.add(Float.valueOf(f)); + this.values.add(f); } /** @@ -154,7 +154,7 @@ class FSFloatConstraintImpl implements F @Override public void geq(float f) { this.codes.add(GEQ); - this.values.add(Float.valueOf(f)); + this.values.add(f); } @Override Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java Tue Dec 4 16:09:53 2018 @@ -269,7 +269,7 @@ public class FeatureValuePathImpl implem switch (typeClass) { case LowLevelCAS.TYPE_CLASS_FLOATARRAY: int position = getArrayIndex(arraySize); - return Float.valueOf(cas.ll_getFloatArrayValue(arrayFS, position, false)); + return cas.ll_getFloatArrayValue(arrayFS, position, false); case LowLevelCAS.TYPE_CLASS_FSARRAY: int childFS = getFsAtIndex(arrayFS, cas, arraySize); return this.childPath.evaluateAsFloat(childFS, cas); @@ -309,7 +309,7 @@ public class FeatureValuePathImpl implem int typeClass = cas.ll_getTypeClass(this.featureRangeType); switch (typeClass) { case LowLevelCAS.TYPE_CLASS_FLOAT: - return Float.valueOf(cas.ll_getFloatValue(currentFS, this.featureCode, CAS_TYPE_CHECKS)); + return cas.ll_getFloatValue(currentFS, this.featureCode, CAS_TYPE_CHECKS); default: throw new IllegalStateException("feature path does not denote a float"); } @@ -356,7 +356,7 @@ public class FeatureValuePathImpl implem } else { // this snippet denotes a float array, just collect it for (int i = 0; i < arraySize; i++) { - result[i] = Float.valueOf(cas.ll_getFloatArrayValue(arrayFS, i)); + result[i] = cas.ll_getFloatArrayValue(arrayFS, i); } } return result; @@ -386,7 +386,7 @@ public class FeatureValuePathImpl implem // FSList // iterate through the results , which will return floats for (int i = 0; i < resultList.size(); i++) { - int childFS = ((Integer) resultList.get(i)).intValue(); + int childFS = (Integer) resultList.get(i); result[i] = this.childPath.evaluateAsFloat(childFS, cas); } } else { @@ -428,7 +428,7 @@ public class FeatureValuePathImpl implem switch (typeClass) { case LowLevelCAS.TYPE_CLASS_INTARRAY: int position = getArrayIndex(arraySize); - return Integer.valueOf(cas.ll_getIntArrayValue(arrayFS, position, false)); + return cas.ll_getIntArrayValue(arrayFS, position, false); case LowLevelCAS.TYPE_CLASS_FSARRAY: int childFS = getFsAtIndex(arrayFS, cas, arraySize); return this.childPath.evaluateAsInt(childFS, cas); @@ -464,14 +464,14 @@ public class FeatureValuePathImpl implem } else if (this.isCoveredTextFeature || this.isTypeNameFeature) { throw new IllegalStateException("feature path does not denote an int"); } else if (this.isFsIdFeature) { - return Integer.valueOf(currentFS); + return currentFS; } else if (this.isUniqueIdFeature) { - return Integer.valueOf(currentFS); // TODO: return currentFs + chunkId + return currentFS; // TODO: return currentFs + chunkId } else { int typeClass = cas.ll_getTypeClass(this.featureRangeType); switch (typeClass) { case LowLevelCAS.TYPE_CLASS_INT: - return Integer.valueOf(cas.ll_getIntValue(currentFS, this.featureCode, CAS_TYPE_CHECKS)); + return cas.ll_getIntValue(currentFS, this.featureCode, CAS_TYPE_CHECKS); default: throw new IllegalStateException("feature path does not denote an int"); } @@ -518,7 +518,7 @@ public class FeatureValuePathImpl implem } else { // this snippet denotes an int array, just collect it for (int i = 0; i < arraySize; i++) { - result[i] = Integer.valueOf(cas.ll_getIntArrayValue(arrayFS, i)); + result[i] = cas.ll_getIntArrayValue(arrayFS, i); } } return result; @@ -548,7 +548,7 @@ public class FeatureValuePathImpl implem // FSList // iterate through the results , which will return floats for (int i = 0; i < resultList.size(); i++) { - int childFS = ((Integer) resultList.get(i)).intValue(); + int childFS = (Integer) resultList.get(i); result[i] = this.childPath.evaluateAsInt(childFS, cas); } } else { @@ -731,7 +731,7 @@ public class FeatureValuePathImpl implem // FSList // iterate through the results , which will return floats for (int i = 0; i < resultList.size(); i++) { - int childFS = ((Integer) resultList.get(i)).intValue(); + int childFS = (Integer) resultList.get(i); result[i] = this.childPath.evaluateAsString(childFS, cas); } } else { @@ -1077,7 +1077,7 @@ public class FeatureValuePathImpl implem } Object valueAtListIndex = getValueAtListIndex(cas, listFS); if (valueAtListIndex != null) { - return ((Integer) valueAtListIndex).intValue(); + return (Integer) valueAtListIndex; } return 0; } @@ -1090,11 +1090,11 @@ public class FeatureValuePathImpl implem case TYPE_CLASS_STRINGLIST: return cas.ll_getStringValue(listFS, this.headFeature); case TYPE_CLASS_INTEGERLIST: - return Integer.valueOf(cas.ll_getIntValue(listFS, this.headFeature)); + return cas.ll_getIntValue(listFS, this.headFeature); case TYPE_CLASS_FLOATLIST: - return Float.valueOf(cas.ll_getFloatValue(listFS, this.headFeature)); + return cas.ll_getFloatValue(listFS, this.headFeature); case TYPE_CLASS_FSLIST: - return Integer.valueOf(cas.ll_getRefValue(listFS, this.headFeature)); + return cas.ll_getRefValue(listFS, this.headFeature); default: return null; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Tue Dec 4 16:09:53 2018 @@ -227,7 +227,7 @@ public class XCASSerializer { */ private int isQueued(TOP fs, int value) { Integer v = this.queued.get(fs); - return (null == v) ? KEY_NOT_FOUND : (value == v.intValue()) ? KEY_AND_VALUE_MATCH : KEY_ONLY_MATCH; + return (null == v) ? KEY_NOT_FOUND : (value == v) ? KEY_AND_VALUE_MATCH : KEY_ONLY_MATCH; } /* Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java Tue Dec 4 16:09:53 2018 @@ -33,11 +33,11 @@ public class PrimitiveValueImpl implemen } public PrimitiveValueImpl(int aValue) { - aValueObject = Integer.valueOf(aValue); + aValueObject = aValue; } public PrimitiveValueImpl(float aValue) { - aValueObject = Float.valueOf(aValue); + aValueObject = aValue; } public String toString() { @@ -49,7 +49,7 @@ public class PrimitiveValueImpl implemen public int toInt() { if (aValueObject instanceof Integer) - return ((Integer) aValueObject).intValue(); + return (Integer) aValueObject; else if (aValueObject instanceof String) { try { return Integer.parseInt((String) aValueObject); @@ -64,7 +64,7 @@ public class PrimitiveValueImpl implemen public float toFloat() { if (aValueObject instanceof Float) - return ((Float) aValueObject).floatValue(); + return (Float) aValueObject; else if (aValueObject instanceof String) { try { return Float.parseFloat((String) aValueObject); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java Tue Dec 4 16:09:53 2018 @@ -69,7 +69,7 @@ public class StringToIntMap { if (i == null) { return DEFAULT_VALUE; } - return i.intValue(); + return i; } /** @@ -87,9 +87,9 @@ public class StringToIntMap { if (i == null) { rc = 0; } else { - rc = i.intValue(); + rc = i; } - i = Integer.valueOf(value); + i = value; this.map.put(key, i); return rc; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java Tue Dec 4 16:09:53 2018 @@ -128,7 +128,7 @@ public class SymbolTable { */ public int set(String symbol) { if (this.symbol2intMap.containsKey(symbol)) { - return this.symbol2intMap.get(symbol).intValue(); + return this.symbol2intMap.get(symbol); } int rel; int abs; @@ -137,7 +137,7 @@ public class SymbolTable { abs = this.symbol2intMap.size(); rel = abs2rel(abs); // System.out.println("Adding symbol " + symbol + " at pos: " + i); - this.symbol2intMap.put(symbol, Integer.valueOf(rel)); + this.symbol2intMap.put(symbol, rel); int2symbolMap.add(symbol); } return rel; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java Tue Dec 4 16:09:53 2018 @@ -421,7 +421,7 @@ public class UimacppAnalysisComponent ex log.logrb(Level.SEVERE, CLASS_NAME.getName(), "logJTafException", LOG_RESOURCE_BUNDLE, "UIMA_taf_internal_exception__SEVERE", - new Object[] { Long.valueOf(errorCode), errorName }); + new Object[] {errorCode, errorName }); } Exception et = e.getEmbeddedException(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Tue Dec 4 16:09:53 2018 @@ -867,7 +867,7 @@ public class CasCreationUtils { if (multiRefAllowed == null) { multiRefAllowed = Boolean.FALSE; // default to false if unspecified } - typeSystemMgr.addFeature(featName, type, rangeType, multiRefAllowed.booleanValue()); + typeSystemMgr.addFeature(featName, type, rangeType, multiRefAllowed); } } } @@ -1737,7 +1737,7 @@ public class CasCreationUtils { // not ok otherwise if (!(((mra1 == null) && (mra2 == null)) || ((mra1 != null) && mra1.equals(mra2)) - || ((mra1 == null) && !mra2.booleanValue()) || ((mra2 == null) && !mra1.booleanValue()))) { + || ((mra1 == null) && !mra2) || ((mra2 == null) && !mra1))) { throw new ResourceInitializationException( ResourceInitializationException.INCOMPATIBLE_MULTI_REFS, new Object[] { aType.getName() + ":" + feat.getName(), aType.getSourceUrlString() }); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java Tue Dec 4 16:09:53 2018 @@ -223,7 +223,7 @@ public class Settings_impl implements Se } // Add the name for the duration of the lookup - resolving.put(name, new Integer(resolving.size())); + resolving.put(name, resolving.size()); try { return resolve(from, map.get(name)); } finally { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java Tue Dec 4 16:09:53 2018 @@ -87,7 +87,7 @@ public class SimpleCasGenerator extends lastDocument = null; lastResultSpec = null; - this.nToGen = ((Integer) aContext.getConfigParameterValue("NumberToGenerate")).intValue(); + this.nToGen = (Integer) aContext.getConfigParameterValue("NumberToGenerate"); FileInputStream fis = null; try { String filename = ((String) aContext.getConfigParameterValue("InputFile")).trim(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/ae/noop/NoOpAnnotator.java Tue Dec 4 16:09:53 2018 @@ -52,24 +52,23 @@ public class NoOpAnnotator extends CasAn } if (getContext().getConfigParameterValue("ErrorFrequency") != null) { - errorFrequency = ((Integer) getContext().getConfigParameterValue("ErrorFrequency")) - .intValue(); + errorFrequency = (Integer) getContext().getConfigParameterValue("ErrorFrequency"); countDown = errorFrequency; } if (getContext().getConfigParameterValue("CpCDelay") != null) { - cpcDelay = ((Integer) getContext().getConfigParameterValue("CpCDelay")).intValue(); + cpcDelay = (Integer) getContext().getConfigParameterValue("CpCDelay"); System.out.println("NoOpAnnotator.initialize() Initializing With CpC Delay of " + cpcDelay + " millis"); } if (getContext().getConfigParameterValue("ProcessDelay") != null) { - processDelay = ((Integer) getContext().getConfigParameterValue("ProcessDelay")).intValue(); + processDelay = (Integer) getContext().getConfigParameterValue("ProcessDelay"); System.out.println("NoOpAnnotator.initialize() Initializing With Process Delay of " + processDelay + " millis"); } if (getContext().getConfigParameterValue("FinalCount") != null) { - finalCount = ((Integer) getContext().getConfigParameterValue("FinalCount")).intValue(); + finalCount = (Integer) getContext().getConfigParameterValue("FinalCount"); } // write log messages Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java Tue Dec 4 16:09:53 2018 @@ -252,7 +252,7 @@ public class AnnotatorContext_implTest e Assert.assertEquals(3, intArr3[2].intValue()); Float floatVal3 = (Float) mAC1.getConfigParameterValue("zh", "FloatParam"); - Assert.assertEquals(3.14, floatVal3.floatValue(), 0.0001); + Assert.assertEquals(3.14, floatVal3, 0.0001); // test override String str4 = (String) mAC2.getConfigParameterValue("en", "StringParam"); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java Tue Dec 4 16:09:53 2018 @@ -53,7 +53,7 @@ public class FlowControllerForErrorTest FlowConstraints flowConstraints = aContext.getAggregateMetadata().getFlowConstraints(); mSequence = ((FixedFlow) flowConstraints).getFixedFlow(); Boolean paramVal = (Boolean)aContext.getConfigParameterValue(PARAM_CONTINUE_ON_FAILURE); - mContinueOnFailure = paramVal != null && paramVal.booleanValue(); + mContinueOnFailure = paramVal != null && paramVal; } /* Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java Tue Dec 4 16:09:53 2018 @@ -127,8 +127,8 @@ public class MultiprocessingAnalysisEngi // initialize a new TAE with parameters Map<String, Object> map = new HashMap<>(); - map.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(5)); - map.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(60000)); + map.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, 5); + map.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, 60000); MultiprocessingAnalysisEngine_impl mtae2 = new MultiprocessingAnalysisEngine_impl(); result = mtae2.initialize(mSimpleDesc, map); Assert.assertTrue(result); @@ -219,7 +219,7 @@ public class MultiprocessingAnalysisEngi */ MultiprocessingAnalysisEngine_impl ae = new MultiprocessingAnalysisEngine_impl(); Map<String, Object> params = new HashMap<>(); - params.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(8)); + params.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, 8); ae.initialize(mAggDesc, params); final int NUM_THREADS = Math.min(50, Runtime.getRuntime().availableProcessors() * 5); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java Tue Dec 4 16:09:53 2018 @@ -107,7 +107,7 @@ public class FeaturePathTest extends Tes featurePath.initialize(path); assertEquals(path, featurePath.getFeaturePath()); featurePath.typeInit(cas.getDocumentAnnotation().getType()); - assertEquals(Float.valueOf(1.12f), featurePath.getFloatValue(cas + assertEquals(1.12f, featurePath.getFloatValue(cas .getDocumentAnnotation())); assertEquals("1.12", featurePath.getValueAsString(cas .getDocumentAnnotation())); @@ -127,7 +127,7 @@ public class FeaturePathTest extends Tes featurePath.initialize(path); assertEquals(path, featurePath.getFeaturePath()); featurePath.typeInit(cas.getDocumentAnnotation().getType()); - assertEquals(Double.valueOf(100.5), featurePath.getDoubleValue(cas + assertEquals(100.5, featurePath.getDoubleValue(cas .getDocumentAnnotation())); assertEquals("100.5", featurePath.getValueAsString(cas .getDocumentAnnotation())); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java Tue Dec 4 16:09:53 2018 @@ -145,8 +145,8 @@ public class UimaContext_implTest extend Integer integer = (Integer) mContext.getConfigParameterValue("IntegerParam"); Assert.assertEquals(Integer.valueOf(42), integer); Integer[] intArr = (Integer[]) mContext.getConfigParameterValue("IntegerArrayParam"); - Assert.assertEquals(Arrays.asList(new Integer[] { Integer.valueOf(1), Integer.valueOf(2), - Integer.valueOf(3) }), Arrays.asList(intArr)); + Assert.assertEquals(Arrays.asList(new Integer[] {1, 2, + 3}), Arrays.asList(intArr)); Float flt = (Float) mContext.getConfigParameterValue("FloatParam"); Assert.assertEquals(Float.valueOf(3.14F), flt); @@ -235,7 +235,7 @@ public class UimaContext_implTest extend Assert.assertEquals(3, intArr3[2].intValue()); Float floatVal3 = (Float) mContext2.getConfigParameterValue("zh", "FloatParam"); - Assert.assertEquals(3.14, floatVal3.floatValue(), 0.0001); + Assert.assertEquals(3.14, floatVal3, 0.0001); // testing duplicate groups assertEquals("common-a", mContext4.getConfigParameterValue("a", "CommonParam")); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java Tue Dec 4 16:09:53 2018 @@ -94,7 +94,7 @@ public class IntBitSetTest extends TestC while (it.hasNext()) { ints.add(it.nextNvc()); } - assertTrue(Arrays.equals(ints.toArray(), new Object[]{Integer.valueOf(1064)})); + assertTrue(Arrays.equals(ints.toArray(), new Object[]{1064})); ibs.add(1063); it = ibs.iterator(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Obj2IntIdentityHashMapTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Obj2IntIdentityHashMapTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Obj2IntIdentityHashMapTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Obj2IntIdentityHashMapTest.java Tue Dec 4 16:09:53 2018 @@ -40,7 +40,7 @@ public class Obj2IntIdentityHashMapTest Map<Integer, Integer> im = new HashMap<>(); public void setUp() { - ihm = new Obj2IntIdentityHashMap<>(Integer.class, new Integer(Integer.MIN_VALUE)); + ihm = new Obj2IntIdentityHashMap<>(Integer.class, Integer.MIN_VALUE); } public void testBasic() { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetTest.java Tue Dec 4 16:09:53 2018 @@ -19,7 +19,6 @@ package org.apache.uima.internal.util; -import java.util.Arrays; import java.util.Random; import junit.framework.TestCase; @@ -32,7 +31,7 @@ public class ObjHashSetTest extends Test Random random; public void setUp() { - ihs = new ObjHashSet<>(Integer.class, new Integer(Integer.MIN_VALUE)); + ihs = new ObjHashSet<>(Integer.class, Integer.MIN_VALUE); } public void testBasic() { @@ -41,7 +40,7 @@ public class ObjHashSetTest extends Test ihs.add(188); Integer[] sv = ihs.toArray(); assertEquals(2, sv.length); - assertEquals(15 + 188, sv[0].intValue() + sv[1].intValue()); + assertEquals(15 + 188, sv[0] + sv[1]); // test most positive / negative ihs.clear(); @@ -94,7 +93,7 @@ public class ObjHashSetTest extends Test /** Test with 2 byte numbers */ checkRemovedReuse(true); - ihs = new ObjHashSet<>(Integer.class, new Integer(Integer.MIN_VALUE)); + ihs = new ObjHashSet<>(Integer.class, Integer.MIN_VALUE); for (int i = 1; i < 99; i++) { ihs.add(i); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java Tue Dec 4 16:09:53 2018 @@ -102,13 +102,13 @@ public class ConfigurableResource_implTe "StringArrayParam", "BooleanArrayParam", "IntegerArrayParam", "FloatArrayParam" }; String theStr = "hello world"; - Boolean theBool = Boolean.valueOf(false); - Integer theInt = Integer.valueOf(42); - Float theFloat = Float.valueOf(2.718281828459045F); + Boolean theBool = Boolean.FALSE; + Integer theInt = 42; + Float theFloat = 2.718281828459045F; String[] theStrArr = { "the", "quick", "brown", "fox" }; - Boolean[] theBoolArr = { Boolean.valueOf(false), Boolean.valueOf(true) }; - Integer[] theIntArr = { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3) }; - Float[] theFloatArr = { Float.valueOf(3.0F), Float.valueOf(3.1F), Float.valueOf(3.14F) }; + Boolean[] theBoolArr = {Boolean.FALSE, Boolean.TRUE}; + Integer[] theIntArr = {1, 2, 3}; + Float[] theFloatArr = {3.0F, 3.1F, 3.14F}; Object[] values = new Object[] { theStr, theBool, theInt, theFloat, theStrArr, theBoolArr, theIntArr, theFloatArr }; @@ -127,7 +127,7 @@ public class ConfigurableResource_implTe // invalid settings // wrong type Exception ex = null; - testResource1.setConfigParameterValue("StringParam", Integer.valueOf(13)); + testResource1.setConfigParameterValue("StringParam", 13); try { testResource1.reconfigure(); } catch (ResourceConfigurationException e) { @@ -146,8 +146,8 @@ public class ConfigurableResource_implTe // inappropriate array ex = null; - testResource1.setConfigParameterValue("FloatParam", new Float[] { Float.valueOf(0.1F), - Float.valueOf(0.2F), Float.valueOf(0.3F) }); + testResource1.setConfigParameterValue("FloatParam", new Float[] {0.1F, + 0.2F, 0.3F}); try { testResource1.reconfigure(); } catch (ResourceConfigurationException e) { @@ -157,7 +157,7 @@ public class ConfigurableResource_implTe // array required ex = null; - testResource1.setConfigParameterValue("BooleanArrayParam", Boolean.valueOf(true)); + testResource1.setConfigParameterValue("BooleanArrayParam", Boolean.TRUE); try { testResource1.reconfigure(); } catch (ResourceConfigurationException e) { @@ -194,14 +194,14 @@ public class ConfigurableResource_implTe new String[] { "StringParam", "StringArrayParam", "IntegerParam", "IntegerArrayParam" }, new String[] { "StringParam", "StringArrayParam", "FloatParam", "FloatArrayParam" } }; Object[][] grpValues = new Object[][] { - new Object[] { "test", new String[] { "foo", "bar" }, Integer.valueOf(1024), - new Integer[] { Integer.valueOf(1), Integer.valueOf(3), Integer.valueOf(5) } }, - new Object[] { "blah", new String[] { "abc", "def" }, Integer.valueOf(32768), - new Integer[] { Integer.valueOf(-1), Integer.valueOf(-3), Integer.valueOf(-5) } }, - new Object[] { "?", new String[] { "+", "-" }, Integer.valueOf(112376), - new Integer[] { Integer.valueOf(-1), Integer.valueOf(0), Integer.valueOf(1) } }, - new Object[] { "different", new String[] { "test", "ing" }, Float.valueOf(49.95F), - new Float[] { Float.valueOf(3.14F), Float.valueOf(2.71F), Float.valueOf(1.4F) } } }; + new Object[] { "test", new String[] { "foo", "bar" }, 1024, + new Integer[] {1, 3, 5} }, + new Object[] { "blah", new String[] { "abc", "def" }, 32768, + new Integer[] {-1, -3, -5} }, + new Object[] { "?", new String[] { "+", "-" }, 112376, + new Integer[] {-1, 0, 1} }, + new Object[] { "different", new String[] { "test", "ing" }, 49.95F, + new Float[] {3.14F, 2.71F, 1.4F} } }; for (int i = 0; i < groupNames.length; i++) { String[] paramsInGrp = grpParamNames[i]; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java Tue Dec 4 16:09:53 2018 @@ -70,25 +70,25 @@ public class MetaDataObject_implTest ext apple1 = new TestFruitObject(); apple1.setAttributeValue("name", "Apple"); apple1.setAttributeValue("color", "red"); - apple1.setAttributeValue("avgWeightLbs", Float.valueOf(0.3F)); - apple1.setAttributeValue("avgCostCents", Integer.valueOf(40)); - apple1.setAttributeValue("citrus", Boolean.valueOf(false)); + apple1.setAttributeValue("avgWeightLbs", 0.3F); + apple1.setAttributeValue("avgCostCents", 40); + apple1.setAttributeValue("citrus", Boolean.FALSE); apple1.setAttributeValue("commonUses", new String[] { "baking", "snack" }); apple2 = new TestFruitObject(); apple2.setAttributeValue("name", "Apple"); apple2.setAttributeValue("color", "red"); - apple2.setAttributeValue("avgWeightLbs", Float.valueOf(0.3F)); - apple2.setAttributeValue("avgCostCents", Integer.valueOf(40)); - apple2.setAttributeValue("citrus", Boolean.valueOf(false)); + apple2.setAttributeValue("avgWeightLbs", 0.3F); + apple2.setAttributeValue("avgCostCents", 40); + apple2.setAttributeValue("citrus", Boolean.FALSE); apple2.setAttributeValue("commonUses", new String[] { "baking", "snack" }); orange = new TestFruitObject(); orange.setAttributeValue("name", "Orange"); orange.setAttributeValue("color", "orange"); - orange.setAttributeValue("avgWeightLbs", Float.valueOf(0.2F)); - orange.setAttributeValue("avgCostCents", Integer.valueOf(50)); - orange.setAttributeValue("citrus", Boolean.valueOf(true)); + orange.setAttributeValue("avgWeightLbs", 0.2F); + orange.setAttributeValue("avgCostCents", 50); + orange.setAttributeValue("citrus", Boolean.TRUE); orange.setAttributeValue("commonUses", new String[] { "snack", "juice" }); // create a fruit bag containing these three objects Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_implTest.java Tue Dec 4 16:09:53 2018 @@ -94,7 +94,7 @@ public class TypeSystemDescription_implT assertEquals("Direct references to sentences in this paragraph", features[0].getDescription()); assertEquals("uima.cas.FSArray", features[0].getRangeTypeName()); assertEquals("Sentence", features[0].getElementType()); - assertFalse(features[0].getMultipleReferencesAllowed().booleanValue()); + assertFalse(features[0].getMultipleReferencesAllowed()); // ts.toXML(System.out); } catch (Exception e) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java Tue Dec 4 16:09:53 2018 @@ -347,7 +347,7 @@ public class LevelTest extends TestCase public void testEquals() throws Exception { Level level = Level.SEVERE; - Integer myInt = Integer.valueOf(70000); + Integer myInt = 70000; // check if level is equal to "SEVERE" Assert.assertTrue(level.equals(Level.SEVERE)); Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java Tue Dec 4 16:09:53 2018 @@ -161,7 +161,7 @@ public class BaseCPMImpl implements Base defaultProcessTrace = true; cpeFactory.parse(); } else { - defaultProcessTrace = mode.booleanValue(); + defaultProcessTrace = mode; cpeFactory.parse(aDescriptor); } init(mode == null, UIMAFramework.getDefaultPerformanceTuningProperties()); @@ -1185,7 +1185,7 @@ public void process(BaseCollectionReader .intValue()), 0, null); if (System.getProperty("SHOW_CUSTOM_STATS") != null) UIMAFramework.getLogger(this.getClass()).log(Level.FINEST, - "Custom Integer Stat-" + key + " Value=" + ((Integer) o).intValue()); + "Custom Integer Stat-" + key + " Value=" + o); } else { if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) { UIMAFramework.getLogger(this.getClass()).log( Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java Tue Dec 4 16:09:53 2018 @@ -33,8 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import javax.naming.ConfigurationException; - import org.apache.uima.UIMAFramework; import org.apache.uima.UIMARuntimeException; import org.apache.uima.UimaContextAdmin; @@ -437,7 +435,7 @@ public class CPEFactory { } // Provide CollectionReader with the number of documents to process ((ConfigurableResource_ImplBase) colreader).setConfigParameterValue("processSize", - Integer.valueOf((int)numDocs2Process) ); + (int) numDocs2Process); CpeConfiguration cpeType = getCpeDescriptor().getCpeConfiguration(); if (cpeType != null && cpeType.getStartingEntityId() != null && cpeType.getStartingEntityId().trim().length() > 0) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java Tue Dec 4 16:09:53 2018 @@ -318,7 +318,7 @@ public class ProcessingContainer_Impl ex char[] tmp = new char[logPath.length()]; for (int i = 0; i < logPath.length(); i++) { if (logPath.charAt(i) == '\\') { - tmp[i] = new Character(System.getProperty("file.separator").charAt(0)).charValue(); + tmp[i] = new Character(System.getProperty("file.separator").charAt(0)); } else { tmp[i] = logPath.charAt(i); } @@ -1580,8 +1580,8 @@ public boolean isIntegrated() { if (statMap.containsKey(aStatName)) { Object stat = statMap.remove(aStatName); if (stat instanceof Integer) { - int newValue = aStat.intValue() + ((Integer) stat).intValue(); - aStat = Integer.valueOf(newValue); + int newValue = aStat + (Integer) stat; + aStat = newValue; } } statMap.put(aStatName, aStat); Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java Tue Dec 4 16:09:53 2018 @@ -1444,7 +1444,7 @@ public class VinciTAP { * @return - service port */ public int getServicePort() { - return Integer.valueOf(servicePort).intValue(); + return Integer.valueOf(servicePort); } /** Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java Tue Dec 4 16:09:53 2018 @@ -227,8 +227,8 @@ public class ArtifactProducer extends Th .getParameterValue("fetchSize") != null) { // Determines how many at a time this Collection Reader will return // for each fetch - readerFetchSize = ((Integer) collectionReader.getProcessingResourceMetaData() - .getConfigurationParameterSettings().getParameterValue("fetchSize")).intValue(); + readerFetchSize = (Integer) collectionReader.getProcessingResourceMetaData() + .getConfigurationParameterSettings().getParameterValue("fetchSize"); } } @@ -451,7 +451,7 @@ public class ArtifactProducer extends Th if (cpmStatTable != null) { Progress[] progress = collectionReader.getProgress(); cpmStatTable.put("COLLECTION_READER_PROGRESS", progress); - cpmStatTable.put("COLLECTION_READER_TIME", Long.valueOf(totalFetchTime)); + cpmStatTable.put("COLLECTION_READER_TIME", totalFetchTime); } if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) { UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(), @@ -644,7 +644,7 @@ public class ArtifactProducer extends Th if (cpmStatTable != null) { Progress[] progress = collectionReader.getProgress(); cpmStatTable.put("COLLECTION_READER_PROGRESS", progress); - cpmStatTable.put("COLLECTION_READER_TIME", Long.valueOf(totalFetchTime)); + cpmStatTable.put("COLLECTION_READER_TIME", totalFetchTime); } if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) { UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(), Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java Tue Dec 4 16:09:53 2018 @@ -1663,8 +1663,8 @@ public void asynchStop() { if (collectionReader.getProcessingResourceMetaData().getConfigurationParameterSettings() .getParameterValue("fetchSize") != null) { try { - readerFetchSize = ((Integer) collectionReader.getProcessingResourceMetaData() - .getConfigurationParameterSettings().getParameterValue("fetchSize")).intValue(); + readerFetchSize = (Integer) collectionReader.getProcessingResourceMetaData() + .getConfigurationParameterSettings().getParameterValue("fetchSize"); } catch (NumberFormatException nfe) { readerFetchSize = 1; // restore default } @@ -1755,7 +1755,7 @@ public void asynchStop() { Class[] args = new Class[] { int.class, String.class, CPMEngine.class }; Class cpClass = Class.forName(outputQueueClass); Constructor constructor = cpClass.getConstructor(args); - Object[] oArgs = new Object[] { Integer.valueOf(aQueueSize), "Sequenced Output Queue", this }; + Object[] oArgs = new Object[] {aQueueSize, "Sequenced Output Queue", this }; outputQueue = (BoundedWorkQueue) constructor.newInstance(oArgs); } } else { @@ -1923,8 +1923,8 @@ public void asynchStop() { readerFetchSize = 1; if (collectionReader.getProcessingResourceMetaData().getConfigurationParameterSettings() .getParameterValue("fetchSize") != null) { - readerFetchSize = ((Integer) collectionReader.getProcessingResourceMetaData() - .getConfigurationParameterSettings().getParameterValue("fetchSize")).intValue(); + readerFetchSize = (Integer) collectionReader.getProcessingResourceMetaData() + .getConfigurationParameterSettings().getParameterValue("fetchSize"); } if (System.getProperty("DEBUG_CONTROL") != null) { startDebugControlThread(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java?rev=1848164&r1=1848163&r2=1848164&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java Tue Dec 4 16:09:53 2018 @@ -319,8 +319,7 @@ public class CpeCasProcessorsImpl extend public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions) throws InvalidXMLException { try { - setDropCasOnException(Boolean.valueOf(aElement.getAttribute("dropCasOnException")) - .booleanValue()); + setDropCasOnException(Boolean.valueOf(aElement.getAttribute("dropCasOnException"))); } catch (Exception e) { throw new InvalidXMLException(CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_EXP_missing_attribute_from_xml_element__WARNING", new Object[] {