You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by nk...@apache.org on 2016/02/08 23:35:52 UTC
[17/50] [abbrv] lucene-solr git commit: SOLR-8330: Standardize and
fix logger creation and usage so that they aren't shared across source
files.(merge from branch_5x)
SOLR-8330: Standardize and fix logger creation and usage so that they aren't shared across source files.(merge from branch_5x)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_5_4@1717707 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/edbc3f39
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/edbc3f39
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/edbc3f39
Branch: refs/heads/branch_5_4
Commit: edbc3f39567ad0d623220e5b5899c3860f674d47
Parents: 9093f34
Author: Anshum Gupta <an...@apache.org>
Authored: Thu Dec 3 04:12:31 2015 +0000
Committer: Anshum Gupta <an...@apache.org>
Committed: Thu Dec 3 04:12:31 2015 +0000
----------------------------------------------------------------------
build.xml | 7 +
solr/CHANGES.txt | 8 +
.../analytics/accumulator/BasicAccumulator.java | 3 +-
.../solr/analytics/request/AnalyticsStats.java | 3 +-
.../StatsCollectorSupplierFactory.java | 3 +-
.../handler/clustering/ClusteringComponent.java | 3 +-
.../carrot2/CarrotClusteringEngine.java | 3 +-
.../carrot2/LuceneCarrot2StemmerFactory.java | 6 +-
.../carrot2/LuceneCarrot2TokenizerFactory.java | 5 +-
.../clustering/carrot2/SolrResourceLocator.java | 11 +-
.../SolrStopwordsCarrot2LexicalDataFactory.java | 3 -
.../handler/dataimport/MailEntityProcessor.java | 3 +-
.../handler/dataimport/TikaEntityProcessor.java | 3 -
.../handler/dataimport/BinURLDataSource.java | 3 +-
.../handler/dataimport/DIHCacheSupport.java | 4 +-
.../handler/dataimport/DataImportHandler.java | 3 +-
.../solr/handler/dataimport/DataImporter.java | 3 +-
.../dataimport/DateFormatTransformer.java | 4 +-
.../solr/handler/dataimport/DocBuilder.java | 3 +-
.../handler/dataimport/EntityProcessorBase.java | 3 +-
.../dataimport/EntityProcessorWrapper.java | 3 +-
.../dataimport/FieldReaderDataSource.java | 3 +-
.../dataimport/FieldStreamDataSource.java | 3 +-
.../solr/handler/dataimport/FileDataSource.java | 3 +-
.../solr/handler/dataimport/JdbcDataSource.java | 3 +-
.../solr/handler/dataimport/LogTransformer.java | 3 +-
.../dataimport/PlainTextEntityProcessor.java | 3 -
.../handler/dataimport/RegexTransformer.java | 3 +-
.../dataimport/SimplePropertiesWriter.java | 4 +-
.../handler/dataimport/SolrEntityProcessor.java | 3 +-
.../solr/handler/dataimport/SolrWriter.java | 3 +-
.../handler/dataimport/SqlEntityProcessor.java | 3 +-
.../handler/dataimport/TemplateTransformer.java | 3 +-
.../solr/handler/dataimport/URLDataSource.java | 3 +-
.../dataimport/XPathEntityProcessor.java | 3 +-
.../handler/dataimport/XPathRecordReader.java | 3 +-
.../handler/dataimport/ZKPropertiesWriter.java | 4 +-
.../apache/solr/handler/dataimport/Zipper.java | 3 +-
.../dataimport/config/ConfigParseUtil.java | 2 -
.../dataimport/config/DIHConfiguration.java | 3 +-
.../AbstractSqlEntityProcessorTestCase.java | 6 +
.../handler/dataimport/TestNestedChildren.java | 6 +
.../dataimport/TestSimplePropertiesWriter.java | 5 +
.../TestSolrEntityProcessorEndToEnd.java | 3 +-
.../dataimport/TestSolrEntityProcessorUnit.java | 3 -
.../dataimport/TestSortedMapBackedCache.java | 4 +-
.../dataimport/TestSqlEntityProcessorDelta.java | 7 +
.../TestVariableResolverEndToEnd.java | 5 +
.../dataimport/TestZKPropertiesWriter.java | 5 +
.../extraction/ExtractingDocumentLoader.java | 3 +-
.../extraction/ExtractingRequestHandler.java | 3 +-
.../extraction/RegexRulesPasswordProvider.java | 3 +-
.../handler/extraction/SolrContentHandler.java | 3 +-
...DetectLanguageIdentifierUpdateProcessor.java | 7 +-
.../LanguageIdentifierUpdateProcessor.java | 4 +-
.../TikaLanguageIdentifierUpdateProcessor.java | 6 +
.../org/apache/solr/hadoop/BatchWriter.java | 3 +-
.../src/java/org/apache/solr/hadoop/GoLive.java | 3 +-
.../org/apache/solr/hadoop/HeartBeater.java | 3 +-
.../solr/hadoop/LineRandomizerMapper.java | 3 +-
.../solr/hadoop/LineRandomizerReducer.java | 3 +-
.../solr/hadoop/MapReduceIndexerTool.java | 3 +-
.../solr/hadoop/SolrCloudPartitioner.java | 3 +-
.../apache/solr/hadoop/SolrOutputFormat.java | 3 +-
.../apache/solr/hadoop/SolrRecordWriter.java | 3 +-
.../org/apache/solr/hadoop/SolrReducer.java | 3 +-
.../org/apache/solr/hadoop/TreeMergeMapper.java | 3 +-
.../solr/hadoop/TreeMergeOutputFormat.java | 5 +-
.../apache/solr/hadoop/ZooKeeperInspector.java | 3 +-
.../RetainMostRecentUpdateConflictResolver.java | 3 +-
.../hadoop/morphline/MorphlineMapRunner.java | 3 +-
.../solr/hadoop/morphline/MorphlineMapper.java | 3 +-
.../org/apache/solr/hadoop/IdentityMapper.java | 3 +-
.../org/apache/solr/hadoop/IdentityReducer.java | 3 +-
.../MapReduceIndexerToolArgumentParserTest.java | 4 -
.../solr/SafeConcurrentUpdateSolrClient.java | 4 +-
.../solr/SolrClientDocumentLoader.java | 3 +-
.../solr/morphlines/solr/SolrLocator.java | 3 +-
.../morphlines/solr/ZooKeeperDownloader.java | 3 +-
.../solr/AbstractSolrMorphlineTestBase.java | 3 +-
.../solr/CollectingDocumentLoader.java | 3 +-
.../solr/uima/processor/UIMAToSolrMapper.java | 3 +-
.../processor/UIMAUpdateRequestProcessor.java | 4 +-
.../solr/response/VelocityResponseWriter.java | 3 +-
.../client/solrj/embedded/JettySolrRunner.java | 3 +-
.../org/apache/solr/cloud/ActionThrottle.java | 4 +-
.../src/java/org/apache/solr/cloud/Assign.java | 4 -
.../java/org/apache/solr/cloud/CloudUtil.java | 3 +-
.../org/apache/solr/cloud/DistributedMap.java | 4 +-
.../org/apache/solr/cloud/DistributedQueue.java | 3 +-
.../org/apache/solr/cloud/ElectionContext.java | 10 +-
.../org/apache/solr/cloud/LeaderElector.java | 3 +-
.../cloud/LeaderInitiatedRecoveryThread.java | 3 +-
.../java/org/apache/solr/cloud/Overseer.java | 3 +-
.../OverseerAutoReplicaFailoverThread.java | 3 +-
.../cloud/OverseerCollectionMessageHandler.java | 4 +-
.../cloud/OverseerConfigSetMessageHandler.java | 4 +-
.../solr/cloud/OverseerNodePrioritizer.java | 4 +-
.../solr/cloud/OverseerTaskProcessor.java | 4 +-
.../apache/solr/cloud/OverseerTaskQueue.java | 4 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 3 +-
.../solr/cloud/SizeLimitedDistributedMap.java | 5 -
.../org/apache/solr/cloud/SolrZkServer.java | 6 +-
.../org/apache/solr/cloud/SyncStrategy.java | 3 +-
.../org/apache/solr/cloud/ZkController.java | 3 +-
.../apache/solr/cloud/ZkSolrResourceLoader.java | 5 +
.../cloud/overseer/ClusterStateMutator.java | 4 +-
.../solr/cloud/overseer/CollectionMutator.java | 4 +-
.../solr/cloud/overseer/ReplicaMutator.java | 4 +-
.../solr/cloud/overseer/SliceMutator.java | 4 +-
.../solr/cloud/overseer/ZkStateWriter.java | 4 +-
.../apache/solr/cloud/rule/ImplicitSnitch.java | 3 -
.../apache/solr/cloud/rule/ReplicaAssigner.java | 4 +-
.../apache/solr/cloud/rule/SnitchContext.java | 3 +-
.../solr/core/CachingDirectoryFactory.java | 4 +-
.../src/java/org/apache/solr/core/Config.java | 3 +-
.../apache/solr/core/ConfigSetProperties.java | 3 +-
.../org/apache/solr/core/ConfigSetService.java | 4 +-
.../org/apache/solr/core/CoreContainer.java | 3 +-
.../org/apache/solr/core/CoreDescriptor.java | 7 +-
.../apache/solr/core/CorePropertiesLocator.java | 3 +-
.../java/org/apache/solr/core/Diagnostics.java | 3 +-
.../org/apache/solr/core/DirectoryFactory.java | 3 +-
.../apache/solr/core/HdfsDirectoryFactory.java | 4 +-
.../solr/core/IndexDeletionPolicyWrapper.java | 5 +-
.../org/apache/solr/core/JarRepository.java | 3 +-
.../org/apache/solr/core/JmxMonitoredMap.java | 5 +-
.../apache/solr/core/MMapDirectoryFactory.java | 3 +-
.../org/apache/solr/core/MemClassLoader.java | 3 +-
.../java/org/apache/solr/core/PluginBag.java | 3 +-
.../apache/solr/core/QuerySenderListener.java | 5 +
.../apache/solr/core/RAMDirectoryFactory.java | 4 -
.../org/apache/solr/core/RequestHandlers.java | 3 +-
.../org/apache/solr/core/RequestParams.java | 3 +-
.../apache/solr/core/RunExecutableListener.java | 5 +
.../java/org/apache/solr/core/SolrConfig.java | 5 +-
.../src/java/org/apache/solr/core/SolrCore.java | 5 +-
.../java/org/apache/solr/core/SolrCores.java | 13 +-
.../apache/solr/core/SolrDeletionPolicy.java | 3 +-
.../org/apache/solr/core/SolrEventListener.java | 5 -
.../apache/solr/core/SolrResourceLoader.java | 3 +-
.../org/apache/solr/core/SolrXmlConfig.java | 3 +-
.../solr/core/StandardDirectoryFactory.java | 3 +-
.../java/org/apache/solr/core/ZkContainer.java | 7 +-
.../org/apache/solr/handler/BlobHandler.java | 3 +-
.../solr/handler/ContentStreamHandlerBase.java | 4 -
.../handler/DocumentAnalysisRequestHandler.java | 3 +-
.../org/apache/solr/handler/IndexFetcher.java | 3 +-
.../solr/handler/MoreLikeThisHandler.java | 5 +-
.../apache/solr/handler/PingRequestHandler.java | 3 +-
.../apache/solr/handler/ReplicationHandler.java | 3 +-
.../apache/solr/handler/RequestHandlerBase.java | 9 +-
.../org/apache/solr/handler/RestoreCore.java | 3 +-
.../org/apache/solr/handler/SchemaHandler.java | 3 +-
.../org/apache/solr/handler/SnapShooter.java | 4 +-
.../apache/solr/handler/SolrConfigHandler.java | 3 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +-
.../solr/handler/UpdateRequestHandler.java | 3 -
.../solr/handler/admin/AdminHandlers.java | 3 +-
.../solr/handler/admin/CollectionsHandler.java | 4 +-
.../solr/handler/admin/ConfigSetsHandler.java | 4 +-
.../solr/handler/admin/CoreAdminHandler.java | 3 +-
.../apache/solr/handler/admin/InfoHandler.java | 3 -
.../solr/handler/admin/LoggingHandler.java | 4 +-
.../solr/handler/admin/LukeRequestHandler.java | 3 +-
.../solr/handler/admin/RebalanceLeaders.java | 4 +-
.../admin/SegmentsInfoRequestHandler.java | 3 -
.../handler/admin/ShowFileRequestHandler.java | 4 +-
.../solr/handler/admin/SystemInfoHandler.java | 3 +-
.../handler/admin/ZookeeperInfoHandler.java | 3 +-
.../solr/handler/component/FacetComponent.java | 3 +-
.../handler/component/HttpShardHandler.java | 3 +-
.../component/HttpShardHandlerFactory.java | 3 +-
.../component/MoreLikeThisComponent.java | 4 +-
.../solr/handler/component/QueryComponent.java | 3 +-
.../component/QueryElevationComponent.java | 3 +-
.../handler/component/RangeFacetProcessor.java | 4 -
.../handler/component/RangeFacetRequest.java | 4 +-
.../handler/component/RealTimeGetComponent.java | 3 +-
.../solr/handler/component/SearchHandler.java | 7 +-
.../handler/component/SpellCheckComponent.java | 7 +-
.../handler/component/SuggestComponent.java | 5 +-
.../solr/handler/loader/CSVLoaderBase.java | 4 -
.../solr/handler/loader/JavabinLoader.java | 3 -
.../apache/solr/handler/loader/JsonLoader.java | 3 +-
.../apache/solr/handler/loader/XMLLoader.java | 7 +-
.../solr/highlight/DefaultSolrHighlighter.java | 3 +-
.../apache/solr/highlight/SolrHighlighter.java | 3 -
.../org/apache/solr/logging/LogWatcher.java | 3 +-
.../org/apache/solr/request/SimpleFacets.java | 4 -
.../apache/solr/request/SolrRequestInfo.java | 10 +-
.../solr/response/BinaryResponseWriter.java | 3 +-
.../apache/solr/response/SchemaXmlWriter.java | 3 +-
.../solr/response/SortingResponseWriter.java | 3 +-
.../solr/response/XSLTResponseWriter.java | 3 +-
.../org/apache/solr/rest/ManagedResource.java | 5 +-
.../solr/rest/ManagedResourceStorage.java | 3 +-
.../java/org/apache/solr/rest/RestManager.java | 3 +-
.../org/apache/solr/rest/SolrSchemaRestApi.java | 3 +-
.../schema/CopyFieldCollectionResource.java | 3 +-
.../schema/DynamicFieldCollectionResource.java | 3 +-
.../solr/rest/schema/DynamicFieldResource.java | 3 +-
.../rest/schema/FieldCollectionResource.java | 3 +-
.../apache/solr/rest/schema/FieldResource.java | 3 +-
.../schema/FieldTypeCollectionResource.java | 3 +-
.../solr/rest/schema/FieldTypeResource.java | 3 +-
.../analysis/ManagedStopFilterFactory.java | 4 -
.../analysis/ManagedSynonymFilterFactory.java | 3 +-
.../schema/analysis/ManagedWordSetResource.java | 7 +-
.../solr/schema/AbstractSpatialFieldType.java | 3 +-
.../AbstractSpatialPrefixTreeFieldType.java | 5 +
.../org/apache/solr/schema/BinaryField.java | 5 +
.../solr/schema/ClassicIndexSchemaFactory.java | 4 +-
.../org/apache/solr/schema/CurrencyField.java | 5 +-
.../java/org/apache/solr/schema/EnumField.java | 3 +-
.../solr/schema/ExternalFileFieldReloader.java | 3 +-
.../java/org/apache/solr/schema/FieldType.java | 3 +-
.../solr/schema/FieldTypePluginLoader.java | 5 +-
.../org/apache/solr/schema/IndexSchema.java | 3 +-
.../apache/solr/schema/IndexSchemaFactory.java | 3 +-
.../solr/schema/JsonPreAnalyzedParser.java | 3 +-
.../apache/solr/schema/ManagedIndexSchema.java | 5 +
.../solr/schema/ManagedIndexSchemaFactory.java | 3 +-
.../schema/OpenExchangeRatesOrgProvider.java | 3 +-
.../apache/solr/schema/PreAnalyzedField.java | 7 +-
.../org/apache/solr/schema/SchemaManager.java | 3 +-
.../java/org/apache/solr/schema/TrieField.java | 5 +
.../apache/solr/schema/ZkIndexSchemaReader.java | 3 +-
.../org/apache/solr/search/CacheConfig.java | 8 +-
.../solr/search/ComplexPhraseQParserPlugin.java | 89 ++++---
.../apache/solr/search/ExportQParserPlugin.java | 1 -
.../org/apache/solr/search/FastLRUCache.java | 4 +
.../java/org/apache/solr/search/Grouping.java | 3 +-
.../java/org/apache/solr/search/LFUCache.java | 4 +
.../java/org/apache/solr/search/LRUCache.java | 4 +
.../org/apache/solr/search/QueryContext.java | 7 +-
.../java/org/apache/solr/search/SolrCache.java | 4 -
.../apache/solr/search/SolrIndexSearcher.java | 3 +-
.../solr/search/SurroundQParserPlugin.java | 92 +++----
.../apache/solr/search/facet/FacetModule.java | 3 -
.../solr/search/facet/UnInvertedField.java | 9 +-
.../solr/search/function/FileFloatSource.java | 14 +-
.../solr/search/grouping/CommandHandler.java | 3 +-
.../TopGroupsResultTransformer.java | 4 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 4 -
.../similarities/DefaultSimilarityFactory.java | 6 +-
.../similarities/SchemaSimilarityFactory.java | 3 -
.../search/stats/ExactSharedStatsCache.java | 4 +-
.../solr/search/stats/ExactStatsCache.java | 3 +-
.../apache/solr/search/stats/LRUStatsCache.java | 3 +-
.../solr/search/stats/LocalStatsCache.java | 4 +-
.../org/apache/solr/search/stats/StatsUtil.java | 4 +-
.../apache/solr/security/BasicAuthPlugin.java | 3 -
.../apache/solr/security/KerberosFilter.java | 5 +-
.../apache/solr/security/KerberosPlugin.java | 3 +-
.../solr/security/PKIAuthenticationPlugin.java | 3 +-
.../security/RuleBasedAuthorizationPlugin.java | 3 +-
.../security/Sha256AuthenticationProvider.java | 11 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 21 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 3 +-
.../apache/solr/servlet/SolrRequestParsers.java | 4 -
.../spelling/AbstractLuceneSpellChecker.java | 3 -
.../solr/spelling/DirectSolrSpellChecker.java | 3 +-
.../solr/spelling/FileBasedSpellChecker.java | 3 +-
.../solr/spelling/IndexBasedSpellChecker.java | 4 -
.../solr/spelling/SpellCheckCollator.java | 3 +-
.../solr/spelling/suggest/SolrSuggester.java | 3 +-
.../apache/solr/spelling/suggest/Suggester.java | 3 +-
.../suggest/jaspell/JaspellLookupFactory.java | 4 +-
.../solr/store/blockcache/BlockDirectory.java | 3 +-
.../apache/solr/store/hdfs/HdfsDirectory.java | 6 +-
.../apache/solr/store/hdfs/HdfsFileReader.java | 3 +-
.../solr/store/hdfs/HdfsLocalityReporter.java | 3 +-
.../apache/solr/store/hdfs/HdfsLockFactory.java | 3 +-
.../org/apache/solr/update/CommitTracker.java | 6 +-
.../solr/update/DefaultSolrCoreState.java | 3 +-
.../solr/update/DirectUpdateHandler2.java | 7 +-
.../apache/solr/update/HdfsTransactionLog.java | 3 +-
.../org/apache/solr/update/HdfsUpdateLog.java | 5 +
.../apache/solr/update/LoggingInfoStream.java | 3 +-
.../java/org/apache/solr/update/PeerSync.java | 3 +-
.../apache/solr/update/SolrCmdDistributor.java | 3 +-
.../org/apache/solr/update/SolrCoreState.java | 3 +-
.../org/apache/solr/update/SolrIndexConfig.java | 3 +-
.../apache/solr/update/SolrIndexSplitter.java | 3 +-
.../org/apache/solr/update/SolrIndexWriter.java | 3 +-
.../solr/update/StreamingSolrClients.java | 3 +-
.../org/apache/solr/update/TransactionLog.java | 3 +-
.../org/apache/solr/update/UpdateHandler.java | 3 +-
.../java/org/apache/solr/update/UpdateLog.java | 3 +-
.../apache/solr/update/UpdateShardHandler.java | 3 +-
.../org/apache/solr/update/VersionInfo.java | 3 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 3 +-
...aluesOrNoneFieldMutatingUpdateProcessor.java | 5 +-
.../processor/AtomicUpdateDocumentMerger.java | 4 +-
.../CloneFieldUpdateProcessorFactory.java | 3 +-
.../processor/DistributedUpdateProcessor.java | 3 +-
...BasedVersionConstraintsProcessorFactory.java | 3 +-
.../DocExpirationUpdateProcessorFactory.java | 3 +-
.../processor/FieldMutatingUpdateProcessor.java | 3 +-
...FieldNameMutatingUpdateProcessorFactory.java | 3 -
.../FieldValueMutatingUpdateProcessor.java | 3 +-
...oreCommitOptimizeUpdateProcessorFactory.java | 100 ++++----
.../processor/LogUpdateProcessorFactory.java | 237 ++++++++++---------
.../solr/update/processor/MD5Signature.java | 4 -
.../ParseDateFieldUpdateProcessorFactory.java | 3 +-
.../ParseDoubleFieldUpdateProcessorFactory.java | 3 +-
.../ParseFloatFieldUpdateProcessorFactory.java | 3 +-
.../ParseIntFieldUpdateProcessorFactory.java | 3 +-
.../ParseLongFieldUpdateProcessorFactory.java | 3 +-
.../PreAnalyzedUpdateProcessorFactory.java | 5 +
.../processor/RegexReplaceProcessorFactory.java | 4 -
.../update/processor/RegexpBoostProcessor.java | 3 +-
.../StatelessScriptUpdateProcessorFactory.java | 3 +-
.../update/processor/URLClassifyProcessor.java | 3 +-
.../UniqFieldsUpdateProcessorFactory.java | 5 -
.../processor/UpdateRequestProcessor.java | 2 -
.../processor/UpdateRequestProcessorChain.java | 3 +-
.../apache/solr/util/ConcurrentLFUCache.java | 3 +-
.../apache/solr/util/ConcurrentLRUCache.java | 3 +-
.../java/org/apache/solr/util/CryptoKeys.java | 4 +-
.../java/org/apache/solr/util/FSHDFSUtils.java | 3 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 3 +-
.../org/apache/solr/util/SolrPluginUtils.java | 7 +-
.../org/apache/solr/util/SystemIdResolver.java | 3 +-
.../solr/util/plugin/AbstractPluginLoader.java | 3 +-
.../solr/util/xslt/TransformerProvider.java | 3 +-
.../org/apache/solr/TestDistributedSearch.java | 5 +
.../org/apache/solr/TestGroupingSearch.java | 5 +
.../core/src/test/org/apache/solr/TestJoin.java | 5 +
.../org/apache/solr/TestRandomDVFaceting.java | 5 +
.../org/apache/solr/TestRandomFaceting.java | 5 +
.../apache/solr/cloud/ActionThrottleTest.java | 3 -
.../apache/solr/cloud/AliasIntegrationTest.java | 3 +-
.../test/org/apache/solr/cloud/AssignTest.java | 4 -
.../solr/cloud/BasicDistributedZkTest.java | 7 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 3 +-
.../solr/cloud/ChaosMonkeyShardSplitTest.java | 5 +
.../apache/solr/cloud/CleanupOldIndexTest.java | 3 -
.../cloud/CloudExitableDirectoryReaderTest.java | 5 +-
.../solr/cloud/ClusterStateUpdateTest.java | 5 +-
.../apache/solr/cloud/CollectionReloadTest.java | 3 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 5 +
.../apache/solr/cloud/CustomCollectionTest.java | 5 +
.../solr/cloud/DeleteInactiveReplicaTest.java | 5 +
.../DeleteLastCustomShardedReplicaTest.java | 5 +
.../apache/solr/cloud/DeleteReplicaTest.java | 5 +
.../solr/cloud/DistribCursorPagingTest.java | 3 +-
...DistribDocExpirationUpdateProcessorTest.java | 3 +-
.../cloud/DistribJoinFromCollectionTest.java | 8 +-
.../solr/cloud/DistributedVersionInfoTest.java | 4 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 4 +-
.../apache/solr/cloud/HttpPartitionTest.java | 4 +-
.../cloud/LeaderElectionIntegrationTest.java | 5 +-
.../apache/solr/cloud/LeaderElectionTest.java | 5 +
.../cloud/LeaderFailoverAfterPartitionTest.java | 5 +
.../LeaderInitiatedRecoveryOnCommitTest.java | 5 +
...aderInitiatedRecoveryOnShardRestartTest.java | 5 -
.../apache/solr/cloud/MigrateRouteKeyTest.java | 5 +
.../apache/solr/cloud/MultiThreadedOCPTest.java | 4 +-
...utOfBoxZkACLAndCredentialsProvidersTest.java | 4 +-
...rriddenZkACLAndCredentialsProvidersTest.java | 4 +-
...verseerCollectionConfigSetProcessorTest.java | 5 +
.../apache/solr/cloud/OverseerRolesTest.java | 5 +
.../org/apache/solr/cloud/OverseerTest.java | 5 +
.../org/apache/solr/cloud/RecoveryZkTest.java | 3 -
.../solr/cloud/ReplicationFactorTest.java | 4 +-
.../solr/cloud/RestartWhileUpdatingTest.java | 3 -
.../apache/solr/cloud/RollingRestartTest.java | 3 +-
.../solr/cloud/SaslZkACLProviderTest.java | 4 +-
.../org/apache/solr/cloud/ShardRoutingTest.java | 5 +
.../org/apache/solr/cloud/ShardSplitTest.java | 5 +
.../apache/solr/cloud/SolrCloudExampleTest.java | 3 +-
.../org/apache/solr/cloud/SolrXmlInZkTest.java | 5 +
.../solr/cloud/TestAuthenticationFramework.java | 5 +-
.../apache/solr/cloud/TestCloudInspectUtil.java | 6 +-
.../apache/solr/cloud/TestCloudPivotFacet.java | 3 +-
.../cloud/TestConfigSetsAPIExclusivity.java | 4 +-
.../org/apache/solr/cloud/TestCryptoKeys.java | 3 -
.../solr/cloud/TestDistribDocBasedVersion.java | 5 +
.../solr/cloud/TestDownShardTolerantSearch.java | 5 +
.../solr/cloud/TestLeaderElectionZkExpiry.java | 6 +
.../solr/cloud/TestMiniSolrCloudCluster.java | 3 +-
.../cloud/TestMiniSolrCloudClusterBase.java | 3 +-
.../cloud/TestRandomRequestDistribution.java | 5 +
.../apache/solr/cloud/TestRebalanceLeaders.java | 3 +-
.../org/apache/solr/cloud/TestZkChroot.java | 3 -
.../cloud/TriLevelCompositeIdRoutingTest.java | 5 +
...MParamsZkACLAndCredentialsProvidersTest.java | 4 +-
.../test/org/apache/solr/cloud/ZkCLITest.java | 4 +-
.../apache/solr/cloud/hdfs/HdfsTestUtil.java | 3 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 4 +-
.../solr/core/CachingDirectoryFactoryTest.java | 6 +
.../solr/core/OpenCloseCoreStressTest.java | 34 ++-
.../core/SolrCoreCheckLockOnStartupTest.java | 5 +
.../apache/solr/core/TestDynamicLoading.java | 3 -
.../apache/solr/core/TestJmxIntegration.java | 5 +
.../apache/solr/core/TestJmxMonitoredMap.java | 7 +-
.../apache/solr/core/TestSolrConfigHandler.java | 4 +-
.../apache/solr/handler/TestBlobHandler.java | 3 +-
.../apache/solr/handler/TestConfigReload.java | 4 +-
.../solr/handler/TestReplicationHandler.java | 4 +
.../apache/solr/handler/TestReqParamsAPI.java | 3 -
.../handler/TestSolrConfigHandlerCloud.java | 3 -
.../TestSolrConfigHandlerConcurrent.java | 4 +-
.../component/QueryElevationComponentTest.java | 4 +
...estDistributedStatsComponentCardinality.java | 5 +-
.../solr/highlight/HighlighterConfigTest.java | 75 +++---
.../org/apache/solr/logging/TestLogWatcher.java | 8 +-
.../apache/solr/request/SimpleFacetsTest.java | 4 +
.../solr/request/TestIntervalFaceting.java | 5 +
.../org/apache/solr/request/TestWriterPerf.java | 4 +-
.../solr/schema/ChangedSchemaMergeTest.java | 8 +
.../solr/schema/TestBulkSchemaConcurrent.java | 3 +-
.../TestCloudManagedSchemaConcurrent.java | 3 +-
.../apache/solr/schema/TestCloudSchemaless.java | 3 +-
.../apache/solr/schema/TestManagedSchema.java | 5 +
.../org/apache/solr/search/TestFiltering.java | 5 +
.../org/apache/solr/search/TestLFUCache.java | 5 +
.../apache/solr/search/TestReloadDeadlock.java | 3 +-
.../test/org/apache/solr/search/TestSort.java | 6 +
.../apache/solr/search/TestStressReorder.java | 3 +-
.../solr/search/TestStressUserVersions.java | 5 +
.../search/join/TestScoreJoinQPNoScore.java | 5 +
.../solr/search/mlt/CloudMLTQParserTest.java | 4 -
.../solr/search/stats/TestDistribIDF.java | 5 +
.../solr/security/BasicAuthIntegrationTest.java | 3 +-
.../solr/security/MockAuthorizationPlugin.java | 3 +-
.../PKIAuthenticationIntegrationTest.java | 4 +-
.../security/TestAuthorizationFramework.java | 4 +-
.../solr/servlet/SolrRequestParserTest.java | 5 +
.../apache/solr/update/AddBlockUpdateTest.java | 5 +
.../org/apache/solr/update/AutoCommitTest.java | 5 +
.../solr/update/DirectUpdateHandlerTest.java | 5 +
.../solr/update/MockStreamingSolrClients.java | 4 -
.../solr/update/SolrIndexSplitterTest.java | 6 +
.../solr/update/TestIndexingPerformance.java | 4 +-
.../processor/TestNamedUpdateProcessors.java | 3 -
.../UpdateRequestProcessorFactoryTest.java | 16 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 3 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 3 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 4 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 4 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 3 +-
.../solrj/impl/Krb5HttpClientConfigurer.java | 3 +-
.../client/solrj/impl/XMLResponseParser.java | 3 +-
.../solr/client/solrj/io/SolrClientCache.java | 3 +-
.../apache/solr/common/cloud/ClusterState.java | 3 -
.../solr/common/cloud/ClusterStateUtil.java | 4 +-
.../solr/common/cloud/ConnectionManager.java | 5 +-
.../common/cloud/DefaultConnectionStrategy.java | 3 +-
.../solr/common/cloud/ImplicitDocRouter.java | 5 -
.../apache/solr/common/cloud/SolrZkClient.java | 4 +-
.../cloud/ZkClientConnectionStrategy.java | 3 +-
.../solr/common/cloud/ZkConfigManager.java | 3 +-
.../apache/solr/common/cloud/ZkStateReader.java | 3 +-
.../apache/solr/common/util/ExecutorUtil.java | 3 +-
.../org/apache/solr/common/util/IOUtils.java | 3 +-
.../org/apache/solr/common/util/RetryUtil.java | 3 +-
.../solr/client/solrj/LargeVolumeTestBase.java | 3 +-
.../solrj/MergeIndexesExampleTestBase.java | 7 +-
.../solr/client/solrj/SolrExampleTests.java | 3 +-
.../solr/client/solrj/SolrExampleTestsBase.java | 4 -
.../client/solrj/SolrSchemalessExampleTest.java | 3 -
.../solr/client/solrj/TestLBHttpSolrClient.java | 3 +-
.../AbstractEmbeddedSolrServerTestCase.java | 4 -
.../solrj/embedded/TestEmbeddedSolrServer.java | 3 +-
.../solrj/embedded/TestSolrProperties.java | 5 +-
.../solrj/impl/BasicHttpSolrClientTest.java | 3 +-
.../client/solrj/impl/CloudSolrClientTest.java | 3 +-
.../client/solrj/request/TestCoreAdmin.java | 3 +-
.../solr/BaseDistributedSearchTestCase.java | 3 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 3 +-
.../java/org/apache/solr/SolrTestCaseHS.java | 7 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 5 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 5 +
.../cloud/AbstractFullDistribZkTestBase.java | 3 +-
.../apache/solr/cloud/AbstractZkTestCase.java | 4 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 4 +-
.../org/apache/solr/cloud/CloudInspectUtil.java | 3 +-
.../java/org/apache/solr/cloud/IpTables.java | 3 +-
.../java/org/apache/solr/cloud/SocketProxy.java | 3 +-
.../solr/cloud/StoppableSearchThread.java | 4 +-
.../org/apache/solr/cloud/ZkTestServer.java | 3 +-
.../apache/solr/util/AbstractSolrTestCase.java | 3 +-
.../org/apache/solr/util/RandomMergePolicy.java | 3 +-
.../java/org/apache/solr/util/RestTestBase.java | 3 +-
487 files changed, 1562 insertions(+), 974 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4723c0d..486f793 100644
--- a/build.xml
+++ b/build.xml
@@ -166,6 +166,7 @@
def javadocsPattern = ~$/(?sm)^\Q/**\E(.*?)\Q*/\E/$;
def lineSplitter = ~$/[\r\n]+/$;
def licenseMatcher = Defaults.createDefaultMatcher();
+ def validLoggerPattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+\p{javaJavaIdentifierStart}+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$;
ant.fileScanner{
fileset(dir: baseDir){
@@ -182,6 +183,7 @@
// excludes:
exclude(name: '**/build/**')
exclude(name: '**/dist/**')
+ exclude(name: '**/CheckLoggingConfiguration.java')
exclude(name: 'build.xml') // ourselves :-)
}
}.each{ f ->
@@ -200,6 +202,11 @@
ratDocument.getMetaData().value(MetaData.RAT_URL_LICENSE_FAMILY_NAME)));
}
}
+ if (f.toString().endsWith('.java') && text.contains('org.slf4j.LoggerFactory')) {
+ if (!validLoggerPattern.matcher(text).find()) {
+ reportViolation(f, 'invalid logging pattern [not private static final, uses static class name]');
+ }
+ }
};
if (found) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 894db74..84892c8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -38,6 +38,11 @@ Upgrading from Solr 5.3
* SOLR-8307: EmptyEntityResolver was moved from core to solrj, and moved from the org.apache.solr.util
package to org.apache.solr.common. If you are using this class, you will need to adjust the import package.
+* Logger declarations in most source files have changed to code that
+ no longer needs to explicitly state the class name. This fixes situations
+ where a logger for a different class was incorrectly used. See SOLR-8324
+ and its sub-issues for details.
+
Detailed Change List
----------------------
@@ -449,6 +454,9 @@ Other Changes
* SOLR-8180: jcl-over-slf4j should have officially been a SolrJ dependency; it now is.
(David Smiley, Kevin Risden)
+* SOLR-8330: Standardize and fix logger creation and usage so that they aren't shared
+ across source files.(Jason Gerlowski, Uwe Schindler, Anshum Gupta)
+
================== 5.3.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java
index 23472fd..c78de1c 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java
@@ -18,6 +18,7 @@
package org.apache.solr.analytics.accumulator;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -46,7 +47,7 @@ import com.google.common.base.Supplier;
* A <code>BasicAccumulator</code> manages the ValueCounters and Expressions without regard to Facets.
*/
public class BasicAccumulator extends ValueAccumulator {
- private static final Logger log = LoggerFactory.getLogger(BasicAccumulator.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final SolrIndexSearcher searcher;
protected final AnalyticsRequest request;
protected final DocSet docs;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
index 3ea48fe..c6d238c 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
@@ -18,6 +18,7 @@
package org.apache.solr.analytics.request;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.lucene.index.LeafReaderContext;
@@ -45,7 +46,7 @@ public class AnalyticsStats {
protected SolrIndexSearcher searcher;
protected SolrQueryRequest req;
protected AnalyticsStatisticsCollector statsCollector;
- private static final Logger log = LoggerFactory.getLogger(AnalyticsStats.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public AnalyticsStats(SolrQueryRequest req, DocSet docs, SolrParams params, AnalyticsStatisticsCollector statsCollector) {
this.req = req;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java
index d59e40b..49d243a 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java
@@ -17,6 +17,7 @@
package org.apache.solr.analytics.statistics;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -74,7 +75,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Supplier;
public class StatsCollectorSupplierFactory {
- private static final Logger log = LoggerFactory.getLogger(StatsCollectorSupplierFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// FunctionTypes
final static int NUMBER_TYPE = 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
index 9f40d48..ad01624 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java
@@ -18,6 +18,7 @@ package org.apache.solr.handler.clustering;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -57,7 +58,7 @@ import com.google.common.collect.Maps;
* @lucene.experimental
*/
public class ClusteringComponent extends SearchComponent implements SolrCoreAware {
- private transient static Logger log = LoggerFactory.getLogger(ClusteringComponent.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Base name for all component parameters. This name is also used to
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
index b6e20d0..0e32ac9 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
@@ -18,6 +18,7 @@ package org.apache.solr.handler.clustering.carrot2;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -82,7 +83,7 @@ import com.google.common.collect.Sets;
* @lucene.experimental
*/
public class CarrotClusteringEngine extends SearchClusteringEngine {
- transient static Logger log = LoggerFactory.getLogger(CarrotClusteringEngine.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* The subdirectory in Solr config dir to read customized Carrot2 resources from.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
index 82887a1..a79cfbf 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
@@ -1,5 +1,7 @@
package org.apache.solr.handler.clustering.carrot2;
+import java.lang.invoke.MethodHandles;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -27,6 +29,7 @@ import org.carrot2.text.linguistic.IStemmer;
import org.carrot2.text.linguistic.IStemmerFactory;
import org.carrot2.util.ReflectionUtils;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.tartarus.snowball.SnowballProgram;
import org.tartarus.snowball.ext.DanishStemmer;
import org.tartarus.snowball.ext.DutchStemmer;
@@ -52,8 +55,7 @@ import org.tartarus.snowball.ext.TurkishStemmer;
* @lucene.experimental
*/
public class LuceneCarrot2StemmerFactory implements IStemmerFactory {
- final static Logger logger = org.slf4j.LoggerFactory
- .getLogger(LuceneCarrot2StemmerFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public IStemmer getStemmer(LanguageCode language) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
index 28fa893..116490f 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.clustering.carrot2;
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.regex.Pattern;
import org.apache.lucene.analysis.TokenStream;
@@ -32,6 +33,7 @@ import org.carrot2.text.util.MutableCharArray;
import org.carrot2.util.ExceptionUtils;
import org.carrot2.util.ReflectionUtils;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An implementation of Carrot2's {@link ITokenizerFactory} based on Lucene's
@@ -42,8 +44,7 @@ import org.slf4j.Logger;
* @lucene.experimental
*/
public class LuceneCarrot2TokenizerFactory implements ITokenizerFactory {
- final static Logger logger = org.slf4j.LoggerFactory
- .getLogger(LuceneCarrot2TokenizerFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public ITokenizer getTokenizer(LanguageCode language) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java
index 1cf28e7..1658957 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.params.SolrParams;
@@ -28,6 +29,8 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.carrot2.util.resource.IResource;
import org.carrot2.util.resource.IResourceLocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link IResourceLocator} that delegates resource searches to {@link SolrCore}.
@@ -38,6 +41,8 @@ class SolrResourceLocator implements IResourceLocator {
private final SolrResourceLoader resourceLoader;
private final String carrot2ResourcesDir;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
public SolrResourceLocator(SolrCore core, SolrParams initParams) {
resourceLoader = core.getResourceLoader();
@@ -58,7 +63,7 @@ class SolrResourceLocator implements IResourceLocator {
@Override
public IResource[] getAll(final String resource) {
final String resourceName = carrot2ResourcesDir + "/" + resource;
- CarrotClusteringEngine.log.debug("Looking for Solr resource: " + resourceName);
+ log.debug("Looking for Solr resource: " + resourceName);
InputStream resourceStream = null;
final byte [] asBytes;
@@ -66,7 +71,7 @@ class SolrResourceLocator implements IResourceLocator {
resourceStream = resourceLoader.openResource(resourceName);
asBytes = IOUtils.toByteArray(resourceStream);
} catch (IOException e) {
- CarrotClusteringEngine.log.debug("Resource not found in Solr's config: " + resourceName
+ log.debug("Resource not found in Solr's config: " + resourceName
+ ". Using the default " + resource + " from Carrot JAR.");
return new IResource[] {};
} finally {
@@ -79,7 +84,7 @@ class SolrResourceLocator implements IResourceLocator {
}
}
- CarrotClusteringEngine.log.info("Loaded Solr resource: " + resourceName);
+ log.info("Loaded Solr resource: " + resourceName);
final IResource foundResource = new IResource() {
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
index e45a116..744e8b3 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
@@ -37,7 +37,6 @@ import org.carrot2.text.util.MutableCharArray;
import org.carrot2.util.attribute.Attribute;
import org.carrot2.util.attribute.Bindable;
import org.carrot2.util.attribute.Input;
-import org.slf4j.Logger;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@@ -55,8 +54,6 @@ import com.google.common.collect.Multimap;
*/
@Bindable
public class SolrStopwordsCarrot2LexicalDataFactory implements ILexicalDataFactory {
- final static Logger logger = org.slf4j.LoggerFactory
- .getLogger(SolrStopwordsCarrot2LexicalDataFactory.class);
@Init
@Input
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
index 2fa2725..0258c33 100644
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
@@ -33,6 +33,7 @@ import javax.mail.internet.MimeMessage;
import javax.mail.search.*;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -55,6 +56,7 @@ public class MailEntityProcessor extends EntityProcessorBase {
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
private static final SimpleDateFormat afterFmt =
new SimpleDateFormat("yyyy/MM/dd", Locale.ROOT);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static interface CustomFilter {
public SearchTerm getCustomSearch(Folder folder);
@@ -806,7 +808,6 @@ public class MailEntityProcessor extends EntityProcessorBase {
private MessageIterator msgIter;
private List<CustomFilter> filters = new ArrayList<>();
private static FetchProfile fp = new FetchProfile();
- private static final Logger LOG = LoggerFactory.getLogger(DataImporter.class);
static {
fp.add(FetchProfile.Item.ENVELOPE);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
index fb8cdb8..22850a1 100644
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
@@ -27,8 +27,6 @@ import org.apache.tika.parser.html.IdentityHtmlMapper;
import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.ContentHandlerDecorator;
import org.apache.tika.sax.XHTMLContentHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -65,7 +63,6 @@ import static org.apache.solr.handler.dataimport.XPathEntityProcessor.URL;
*/
public class TikaEntityProcessor extends EntityProcessorBase {
private TikaConfig tikaConfig;
- private static final Logger LOG = LoggerFactory.getLogger(TikaEntityProcessor.class);
private String format = "text";
private boolean done = false;
private boolean extractEmbedded = false;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/BinURLDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
index 3f9c530..2b3a2c1 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.net.URLConnection;
import java.util.Properties;
@@ -35,7 +36,7 @@ import java.util.Properties;
* @since solr 3.1
*/
public class BinURLDataSource extends DataSource<InputStream>{
- private static final Logger LOG = LoggerFactory.getLogger(BinURLDataSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String baseUrl;
private int connectionTimeout = CONNECTION_TIMEOUT;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
index 0309b17..fde4cc5 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.dataimport;
import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Collections;
@@ -32,8 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DIHCacheSupport {
- private static final Logger log = LoggerFactory
- .getLogger(DIHCacheSupport.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String cacheForeignKey;
private String cacheImplName;
private Map<String,DIHCache> queryVsCache = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
index 0b68da5..2e9d93a 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
@@ -45,6 +45,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;
import java.util.*;
import java.io.StringReader;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import org.slf4j.Logger;
@@ -71,7 +72,7 @@ import org.xml.sax.InputSource;
public class DataImportHandler extends RequestHandlerBase implements
SolrCoreAware {
- private static final Logger LOG = LoggerFactory.getLogger(DataImportHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private DataImporter importer;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
index 52ca977..473c86f 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
@@ -48,6 +48,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import java.io.IOException;
import java.io.StringReader;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -73,7 +74,7 @@ public class DataImporter {
IDLE, RUNNING_FULL_DUMP, RUNNING_DELTA_DUMP, JOB_FAILED
}
- private static final Logger LOG = LoggerFactory.getLogger(DataImporter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger XMLLOG = new XMLErrorLogger(LOG);
private Status status = Status.IDLE;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
index c4042ca..f953779 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
@@ -17,6 +17,7 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -39,8 +40,7 @@ import org.slf4j.LoggerFactory;
*/
public class DateFormatTransformer extends Transformer {
private Map<String, SimpleDateFormat> fmtCache = new HashMap<>();
- private static final Logger LOG = LoggerFactory
- .getLogger(DateFormatTransformer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
index a2337b1..3b6bff6 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
@@ -34,6 +34,7 @@ import org.apache.solr.schema.SchemaField;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -50,7 +51,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public class DocBuilder {
- private static final Logger LOG = LoggerFactory.getLogger(DocBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final Date EPOCH = new Date(0);
public static final String DELETE_DOC_BY_ID = "$deleteDocById";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
index f2d8d57..8311f36 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
@@ -22,6 +22,7 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.*;
/**
@@ -33,7 +34,7 @@ import java.util.*;
* @since solr 1.3
*/
public class EntityProcessorBase extends EntityProcessor {
- private static final Logger log = LoggerFactory.getLogger(EntityProcessorBase.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected boolean isFirstInit = true;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
index 2d47396..c88c577 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
@@ -26,6 +26,7 @@ import static org.apache.solr.handler.dataimport.EntityProcessorBase.SKIP;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
@@ -38,7 +39,7 @@ import java.util.Map;
* @since solr 1.4
*/
public class EntityProcessorWrapper extends EntityProcessor {
- private static final Logger log = LoggerFactory.getLogger(EntityProcessorWrapper.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private EntityProcessor delegate;
private Entity entity;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
index 34136f7..edc8589 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.sql.Blob;
import java.sql.Clob;
@@ -47,7 +48,7 @@ import java.util.Properties;
* @since 1.4
*/
public class FieldReaderDataSource extends DataSource<Reader> {
- private static final Logger LOG = LoggerFactory.getLogger(FieldReaderDataSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected VariableResolver vr;
protected String dataField;
private String encoding;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
index 9a62320..42ba5a6 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
@@ -20,6 +20,7 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVE
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.sql.Blob;
import java.sql.SQLException;
import java.util.Properties;
@@ -44,7 +45,7 @@ import org.slf4j.LoggerFactory;
* @since 3.1
*/
public class FieldStreamDataSource extends DataSource<InputStream> {
- private static final Logger LOG = LoggerFactory.getLogger(FieldReaderDataSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected VariableResolver vr;
protected String dataField;
private EntityProcessorWrapper wrapper;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java
index 9b71d13..2db5804 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/FileDataSource.java
@@ -17,6 +17,7 @@
package org.apache.solr.handler.dataimport;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.Properties;
@@ -57,7 +58,7 @@ public class FileDataSource extends DataSource<Reader> {
*/
protected String encoding = null;
- private static final Logger LOG = LoggerFactory.getLogger(FileDataSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(Context context, Properties initProps) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
index 2d93b10..790d502 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
@@ -33,6 +33,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
@@ -52,7 +53,7 @@ import java.util.concurrent.TimeUnit;
*/
public class JdbcDataSource extends
DataSource<Iterator<Map<String, Object>>> {
- private static final Logger LOG = LoggerFactory.getLogger(JdbcDataSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected Callable<Connection> factory;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LogTransformer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LogTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LogTransformer.java
index 621ff7f..17687e1 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LogTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/LogTransformer.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.dataimport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
/**
@@ -32,7 +33,7 @@ import java.util.Map;
* @since solr 1.4
*/
public class LogTransformer extends Transformer {
- Logger LOG = LoggerFactory.getLogger(LogTransformer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public Object transformRow(Map<String, Object> row, Context ctx) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
index ecc9aab..c75608c 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
@@ -20,8 +20,6 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVE
import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow;
import static org.apache.solr.handler.dataimport.XPathEntityProcessor.URL;
import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.Reader;
@@ -36,7 +34,6 @@ import java.util.Map;
* @since solr 1.4
*/
public class PlainTextEntityProcessor extends EntityProcessorBase {
- private static final Logger LOG = LoggerFactory.getLogger(PlainTextEntityProcessor.class);
private boolean ended = false;
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
index 355aa48..8e0d249 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RegexTransformer.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +40,7 @@ import java.util.regex.Pattern;
* @see Pattern
*/
public class RegexTransformer extends Transformer {
- private static final Logger LOG = LoggerFactory.getLogger(RegexTransformer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
index 93481bb..6ad4f82 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.security.AccessControlException;
import java.text.ParseException;
@@ -49,8 +50,7 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVE
* </p>
*/
public class SimplePropertiesWriter extends DIHProperties {
- private static final Logger log = LoggerFactory
- .getLogger(SimplePropertiesWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final String LAST_INDEX_KEY = "last_index_time";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
index 7292c67..035f975b 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
@@ -56,7 +57,7 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrap
*/
public class SolrEntityProcessor extends EntityProcessorBase {
- private static final Logger LOG = LoggerFactory.getLogger(SolrEntityProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SOLR_SERVER = "url";
public static final String QUERY = "query";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
index 34bea0a..8428837 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrWriter.java
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
/**
@@ -38,7 +39,7 @@ import java.nio.charset.StandardCharsets;
* @since solr 1.3
*/
public class SolrWriter extends DIHWriterBase implements DIHWriter {
- private static final Logger log = LoggerFactory.getLogger(SolrWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String LAST_INDEX_KEY = "last_index_time";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
index 076151a..d30c670 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
import java.util.Map;
import org.slf4j.Logger;
@@ -41,7 +42,7 @@ import java.util.regex.Pattern;
* @since solr 1.3
*/
public class SqlEntityProcessor extends EntityProcessorBase {
- private static final Logger LOG = LoggerFactory.getLogger(SqlEntityProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected DataSource<Iterator<Map<String, Object>>> dataSource;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
index 99da9ef..7cd43f2 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
*/
public class TemplateTransformer extends Transformer {
- private static final Logger LOG = LoggerFactory.getLogger(TemplateTransformer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Map<String ,List<String>> templateVsVars = new HashMap<>();
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/URLDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/URLDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/URLDataSource.java
index d5ed8a0..9271679 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/URLDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/URLDataSource.java
@@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
@@ -40,7 +41,7 @@ import java.util.regex.Pattern;
* @since solr 1.4
*/
public class URLDataSource extends DataSource<Reader> {
- Logger LOG = LoggerFactory.getLogger(URLDataSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String baseUrl;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
index 92fa722..93046bf 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
@@ -34,6 +34,7 @@ import javax.xml.transform.stream.StreamSource;
import java.io.CharArrayReader;
import java.io.CharArrayWriter;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.*;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
@@ -54,7 +55,7 @@ import java.util.concurrent.atomic.AtomicReference;
* @since solr 1.3
*/
public class XPathEntityProcessor extends EntityProcessorBase {
- private static final Logger LOG = LoggerFactory.getLogger(XPathEntityProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger xmllog = new XMLErrorLogger(LOG);
private static final Map<String, Object> END_MARKER = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
index 2d7c961..266e047 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
@@ -24,6 +24,7 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -56,7 +57,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.3
*/
public class XPathRecordReader {
- private static final Logger LOG = LoggerFactory.getLogger(XPathRecordReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger XMLLOG = new XMLErrorLogger(LOG);
private Node rootNode = new Node("/", null);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java
index 36a05cd..0bde409 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ZKPropertiesWriter.java
@@ -18,6 +18,7 @@ package org.apache.solr.handler.dataimport;
import java.io.StringReader;
import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Properties;
@@ -35,8 +36,7 @@ import org.slf4j.LoggerFactory;
*/
public class ZKPropertiesWriter extends SimplePropertiesWriter {
- private static final Logger log = LoggerFactory
- .getLogger(ZKPropertiesWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String path;
private SolrZkClient zkClient;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java
index 8c47e1a..24f1889 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java
@@ -1,5 +1,6 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
import java.util.Iterator;
import java.util.Map;
@@ -30,7 +31,7 @@ import com.google.common.collect.PeekingIterator;
class Zipper {
- private static final Logger log = LoggerFactory.getLogger(Zipper.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final DIHCacheSupport.Relation relation;
@SuppressWarnings("rawtypes")
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigParseUtil.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigParseUtil.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigParseUtil.java
index 5c833fa..fc4a7ac 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigParseUtil.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigParseUtil.java
@@ -25,8 +25,6 @@ import java.util.Map;
import org.apache.solr.handler.dataimport.DataImporter;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
index dc89b0f..1073a64 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
@@ -1,5 +1,6 @@
package org.apache.solr.handler.dataimport.config;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -47,7 +48,7 @@ import org.w3c.dom.Element;
* @since solr 1.3
*/
public class DIHConfiguration {
- private static final Logger LOG = LoggerFactory.getLogger(DIHConfiguration.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// TODO - remove from here and add it to entity
private final String deleteQuery;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
index 9bad444..1ab35e4 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
@@ -4,8 +4,11 @@ import junit.framework.Assert;
import org.apache.solr.common.util.SuppressForbidden;
import org.junit.After;
import org.junit.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -41,6 +44,9 @@ import java.util.Set;
public abstract class AbstractSqlEntityProcessorTestCase extends
AbstractDIHJdbcTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
protected boolean underlyingDataModified;
protected boolean useSimpleCaches;
protected boolean countryEntity;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
index dbc746b..3ad1555 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java
@@ -1,6 +1,10 @@
package org.apache.solr.handler.dataimport;
+import java.lang.invoke.MethodHandles;
+
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +25,8 @@ import org.junit.Test;
public class TestNestedChildren extends AbstractDIHJdbcTestCase {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Test
public void test() throws Exception {
h.query("/dataimport", generateRequest());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/edbc3f39/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
index 5bef61a..1417baa 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
@@ -1,6 +1,7 @@
package org.apache.solr.handler.dataimport;
import java.io.File;
+import java.lang.invoke.MethodHandles;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -16,6 +17,8 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
@@ -36,6 +39,8 @@ import org.junit.Test;
*/
public class TestSimplePropertiesWriter extends AbstractDIHJdbcTestCase {
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean useJdbcEscapeSyntax;
private String dateFormat;