Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed ThreadConfigurableLogger class for upcoming SLF4J change #2615

Open
wants to merge 1 commit into
base: integration
Choose a base branch
from
Open

Removed ThreadConfigurableLogger class for upcoming SLF4J change #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 0 additions & 241 deletions core/common-util/src/main/java/datawave/core/common/logging/ThreadConfigurableLogger.java
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions core/common-util/src/main/java/datawave/core/common/util/EnvProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package datawave.core.common.util;

import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;

import datawave.core.common.logging.ThreadConfigurableLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class EnvProvider {

private static final Logger log = ThreadConfigurableLogger.getLogger(EnvProvider.class);
private static final Logger log = LoggerFactory.getLogger(EnvProvider.class);

private static final String ENV_PREFIX = "env:";

Expand Down
6 changes: 3 additions & 3 deletions warehouse/ingest-core/src/main/java/datawave/ingest/data/TypeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.RecordReader;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;

import datawave.core.common.logging.ThreadConfigurableLogger;
import datawave.ingest.data.config.ConfigurationHelper;
import datawave.ingest.data.config.DataTypeOverrideHelper;
import datawave.ingest.data.config.filter.KeyValueFilter;
Expand All @@ -28,7 +28,7 @@

public class TypeRegistry extends HashMap<String,Type> {

private static final Logger log = ThreadConfigurableLogger.getLogger(TypeRegistry.class);
private static final Logger log = LoggerFactory.getLogger(TypeRegistry.class);

public static final String ALL_PREFIX = "all";

Expand Down
6 changes: 3 additions & 3 deletions warehouse/ingest-core/src/main/java/datawave/ingest/data/config/ingest/BaseIngestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
import java.util.regex.Pattern;

import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.base.Splitter;
import com.google.common.collect.HashMultimap;
Expand All @@ -25,7 +26,6 @@
import com.google.common.collect.Sets;
import com.google.common.collect.TreeMultimap;

import datawave.core.common.logging.ThreadConfigurableLogger;
import datawave.data.normalizer.NormalizationException;
import datawave.data.type.NoOpType;
import datawave.data.type.OneToManyNormalizerType;
Expand Down Expand Up @@ -138,7 +138,7 @@ public abstract class BaseIngestHelper extends AbstractIngestHelper implements C

public static final String FIELD_CONFIG_FILE = ".data.category.field.config.file";

private static final Logger log = ThreadConfigurableLogger.getLogger(BaseIngestHelper.class);
private static final Logger log = LoggerFactory.getLogger(BaseIngestHelper.class);

private Multimap<String,datawave.data.type.Type<?>> typeFieldMap = null;
private Multimap<String,datawave.data.type.Type<?>> typePatternMap = null;
Expand Down
6 changes: 3 additions & 3 deletions ...e/src/main/java/datawave/ingest/mapreduce/handler/dateindex/DateIndexDataTypeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.StatusReporter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;

import datawave.core.common.logging.ThreadConfigurableLogger;
import datawave.data.normalizer.DateNormalizer;
import datawave.ingest.data.RawRecordContainer;
import datawave.ingest.data.Type;
Expand Down Expand Up @@ -78,7 +78,7 @@
*/
public class DateIndexDataTypeHandler<KEYIN> implements DataTypeHandler<KEYIN>, RawRecordMetadata {

private static final Logger log = ThreadConfigurableLogger.getLogger(DateIndexDataTypeHandler.class);
private static final Logger log = LoggerFactory.getLogger(DateIndexDataTypeHandler.class);

public static final String DATEINDEX_TNAME = "date.index.table.name";
public static final String DATEINDEX_LPRIORITY = "date.index.table.loader.priority";
Expand Down
6 changes: 3 additions & 3 deletions ...ore/src/main/java/datawave/ingest/mapreduce/handler/shard/AbstractColumnBasedHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

import org.apache.hadoop.mapreduce.StatusReporter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;

import datawave.core.common.logging.ThreadConfigurableLogger;
import datawave.ingest.data.RawRecordContainer;
import datawave.ingest.data.Type;
import datawave.ingest.data.TypeRegistry;
Expand All @@ -22,7 +22,7 @@ public class AbstractColumnBasedHandler<KEYIN> extends ShardedDataTypeHandler<KE
public static final String INDEX_MISMATCH = "INDEX_MISMATCH";
public static final String REVERSE_INDEX_MISMATCH = "REVERSE_INDEX_MISMATCH";

private static final Logger log = ThreadConfigurableLogger.getLogger(AbstractColumnBasedHandler.class);
private static final Logger log = LoggerFactory.getLogger(AbstractColumnBasedHandler.class);

protected IngestHelperInterface helper = null;
protected Multimap<String,NormalizedContentInterface> fields = HashMultimap.create();
Expand Down
6 changes: 3 additions & 3 deletions ...st-core/src/main/java/datawave/ingest/mapreduce/handler/shard/ShardedDataTypeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
import org.apache.hadoop.mapreduce.Counter;
import org.apache.hadoop.mapreduce.StatusReporter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.base.Stopwatch;
import com.google.common.cache.CacheBuilder;
Expand All @@ -27,7 +28,6 @@
import com.google.common.collect.Multimap;
import com.google.common.hash.BloomFilter;

import datawave.core.common.logging.ThreadConfigurableLogger;
import datawave.ingest.config.IngestConfiguration;
import datawave.ingest.config.IngestConfigurationFactory;
import datawave.ingest.data.RawRecordContainer;
Expand Down Expand Up @@ -120,7 +120,7 @@
*/
public abstract class ShardedDataTypeHandler<KEYIN> extends StatsDEnabledDataTypeHandler<KEYIN> implements DataTypeHandler<KEYIN> {

private static final Logger log = ThreadConfigurableLogger.getLogger(ShardedDataTypeHandler.class);
private static final Logger log = LoggerFactory.getLogger(ShardedDataTypeHandler.class);

public static final String NUM_SHARDS = ShardIdFactory.NUM_SHARDS;
public static final String SHARD_TNAME = "shard.table.name";
Expand Down
Loading
Loading