microsoft
/
spring-cloud-azure
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #55 from Microsoft/use-slf4j 

use slf4j logger
This commit is contained in:
weiping 2018-07-09 10:44:59 +08:00 коммит произвёл GitHub
Родитель b6896efe89 fc7d580f42
Коммит dab6eaf3e0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
12 изменённых файлов: 37 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
spring-cloud-azure-autoconfigure/src/main/java/com/microsoft/azure/spring/cloud/autoconfigure/sql/AbstractJdbcDatasourcePropertiesUpdater.java
Просмотреть файл

@ -7,8 +7,8 @@
package com.microsoft.azure.spring.cloud.autoconfigure.sql;
import com.microsoft.azure.spring.cloud.context.core.AzureAdmin;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@ -19,7 +19,7 @@ import org.springframework.util.StringUtils;
* @author Warren Zhu
*/
public abstract class AbstractJdbcDatasourcePropertiesUpdater implements JdbcDataSourcePropertiesUpdater {
protected static final Log LOGGER = LogFactory.getLog(AbstractJdbcDatasourcePropertiesUpdater.class);
protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractJdbcDatasourcePropertiesUpdater.class);
protected final DatabaseType databaseType;
protected final AzureSqlProperties azureSqlProperties;

6
spring-cloud-azure-autoconfigure/src/main/java/com/microsoft/azure/spring/cloud/autoconfigure/storage/AzureStorageAutoConfiguration.java
Просмотреть файл

@ -15,8 +15,8 @@ import com.microsoft.azure.spring.cloud.context.core.AzureAdmin;
import com.microsoft.azure.spring.cloud.context.core.AzureUtil;
import com.microsoft.azure.spring.cloud.storage.AzureStorageProtocolResolver;
import com.microsoft.azure.storage.CloudStorageAccount;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@ -43,7 +43,7 @@ import java.security.InvalidKeyException;
@EnableConfigurationProperties(AzureStorageProperties.class)
@Import(AzureStorageProtocolResolver.class)
public class AzureStorageAutoConfiguration {
private static final Log LOGGER = LogFactory.getLog(AzureStorageAutoConfiguration.class);
private static final Logger LOGGER = LoggerFactory.getLogger(AzureStorageAutoConfiguration.class);
@Autowired(required = false)
private TelemetryTracker telemetryTracker;

6
spring-cloud-azure-context/src/main/java/com/microsoft/azure/spring/cloud/context/core/DefaultCredentialsProvider.java
Просмотреть файл

@ -8,8 +8,8 @@ package com.microsoft.azure.spring.cloud.context.core;
import com.google.common.base.Strings;
import com.microsoft.azure.credentials.ApplicationTokenCredentials;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import java.io.File;
@ -23,7 +23,7 @@ import java.io.IOException;
*/
public class DefaultCredentialsProvider implements CredentialsProvider {
private static final Log LOGGER = LogFactory.getLog(DefaultCredentialsProvider.class);
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCredentialsProvider.class);
private ApplicationTokenCredentials credentials;

6
spring-cloud-azure-samples/spring-cloud-azure-eventhub-binder-sample/src/main/java/com/example/SinkExample.java
Просмотреть файл

@ -6,8 +6,8 @@
package com.example;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.messaging.Sink;
@ -18,7 +18,7 @@ import org.springframework.cloud.stream.messaging.Sink;
@EnableBinding(Sink.class)
public class SinkExample {
private static final Log LOGGER = LogFactory.getLog(SinkExample.class);
private static final Logger LOGGER = LoggerFactory.getLogger(SinkExample.class);
@StreamListener(Sink.INPUT)
public void handleMessage(UserMessage userMessage) {

6
spring-cloud-azure-samples/spring-cloud-stream-eventhub-kafka-sample/src/main/java/com/example/SinkExample.java
Просмотреть файл

@ -6,8 +6,8 @@
package com.example;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.messaging.Sink;
@ -18,7 +18,7 @@ import org.springframework.cloud.stream.messaging.Sink;
@EnableBinding(Sink.class)
public class SinkExample {
private static final Log LOGGER = LogFactory.getLog(SinkExample.class);
private static final Logger LOGGER = LoggerFactory.getLogger(SinkExample.class);
@StreamListener(Sink.INPUT)
public void handleMessage(UserMessage userMessage) {

8
spring-cloud-azure-storage/src/main/java/com/microsoft/azure/spring/cloud/storage/AzureStorageProtocolResolver.java
Просмотреть файл

@ -8,8 +8,8 @@ package com.microsoft.azure.spring.cloud.storage;
import com.microsoft.azure.storage.CloudStorageAccount;
import com.microsoft.azure.storage.blob.CloudBlobClient;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@ -26,7 +26,7 @@ import org.springframework.core.io.ResourceLoader;
*/
public class AzureStorageProtocolResolver implements ProtocolResolver, BeanFactoryPostProcessor, ResourceLoaderAware {
private static final Log logger = LogFactory.getLog(AzureStorageProtocolResolver.class);
private static final Logger LOGGER = LoggerFactory.getLogger(AzureStorageProtocolResolver.class);
private ConfigurableListableBeanFactory beanFactory;
private CloudBlobClient blobClient;
@ -48,7 +48,7 @@ public class AzureStorageProtocolResolver implements ProtocolResolver, BeanFacto
if (DefaultResourceLoader.class.isAssignableFrom(resourceLoader.getClass())) {
((DefaultResourceLoader) resourceLoader).addProtocolResolver(this);
} else {
logger.warn("The provided delegate resource loader is not an implementation " +
LOGGER.warn("The provided delegate resource loader is not an implementation " +
"of DefaultResourceLoader. Custom Protocol using blob:// prefix will not be enabled.");
}
}

6
spring-cloud-azure-storage/src/main/java/com/microsoft/azure/spring/cloud/storage/BlobStorageResource.java
Просмотреть файл

@ -10,8 +10,8 @@ import com.microsoft.azure.storage.StorageException;
import com.microsoft.azure.storage.blob.CloudBlobClient;
import com.microsoft.azure.storage.blob.CloudBlobContainer;
import com.microsoft.azure.storage.blob.CloudBlockBlob;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.AbstractResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.WritableResource;
@ -28,7 +28,7 @@ import java.net.URL;
* @author Warren Zhu
*/
public class BlobStorageResource extends AbstractResource implements WritableResource {
private static final Log LOGGER = LogFactory.getLog(BlobStorageResource.class);
private static final Logger LOGGER = LoggerFactory.getLogger(BlobStorageResource.class);
private final CloudBlobClient blobClient;
private final String location;

6
spring-integration-azure/src/main/java/com/microsoft/azure/spring/integration/eventhub/DefaultEventHubClientFactory.java
Просмотреть файл

@ -18,8 +18,8 @@ import com.microsoft.azure.spring.cloud.context.core.AzureAdmin;
import com.microsoft.azure.spring.cloud.context.core.AzureUtil;
import com.microsoft.azure.spring.cloud.context.core.Tuple;
import com.microsoft.azure.spring.integration.core.Memoizer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.util.Assert;
@ -36,7 +36,7 @@ import java.util.function.Function;
* @author Warren Zhu
*/
public class DefaultEventHubClientFactory implements EventHubClientFactory, DisposableBean {
private static final Log LOGGER = LogFactory.getLog(DefaultEventHubClientFactory.class);
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultEventHubClientFactory.class);
private final Map<String, EventHubClient> clientsByName = new ConcurrentHashMap<>();

6
spring-integration-azure/src/main/java/com/microsoft/azure/spring/integration/eventhub/EventHubTemplate.java
Просмотреть файл

@ -17,8 +17,8 @@ import com.microsoft.azure.spring.integration.core.Checkpointer;
import com.microsoft.azure.spring.integration.core.PartitionSupplier;
import com.microsoft.azure.spring.cloud.context.core.Tuple;
import com.microsoft.azure.spring.integration.eventhub.inbound.EventHubCheckpointer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
import java.util.Set;
@ -37,7 +37,7 @@ import java.util.function.Consumer;
*/
public class EventHubTemplate implements EventHubOperation {
private static final Log LOGGER = LogFactory.getLog(EventHubTemplate.class);
private static final Logger LOGGER = LoggerFactory.getLogger(EventHubTemplate.class);
private final ConcurrentHashMap<Tuple<String, String>, Set<Consumer<Iterable<EventData>>>>
consumersByNameAndConsumerGroup = new ConcurrentHashMap<>();
private final ConcurrentHashMap<Tuple<String, String>, EventHubCheckpointer> checkpointersByNameAndConsumerGroup =

6
spring-integration-azure/src/main/java/com/microsoft/azure/spring/integration/servicebus/ServiceBusMessageHandler.java
Просмотреть файл

@ -9,8 +9,8 @@ package com.microsoft.azure.spring.integration.servicebus;
import com.microsoft.azure.servicebus.ExceptionPhase;
import com.microsoft.azure.servicebus.IMessage;
import com.microsoft.azure.servicebus.IMessageHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.lang.NonNull;
import java.util.Collections;
@ -24,7 +24,7 @@ import java.util.function.Consumer;
* @author Warren Zhu
*/
public class ServiceBusMessageHandler implements IMessageHandler {
private static final Log LOGGER = LogFactory.getLog(ServiceBusMessageHandler.class);
private static final Logger LOGGER = LoggerFactory.getLogger(ServiceBusMessageHandler.class);
private final Set<Consumer<Iterable<IMessage>>> consumers;
public ServiceBusMessageHandler(@NonNull Set<Consumer<Iterable<IMessage>>> consumers) {

6
spring-integration-azure/src/main/java/com/microsoft/azure/spring/integration/servicebus/queue/ServiceBusQueueTemplate.java
Просмотреть файл

@ -14,8 +14,8 @@ import com.microsoft.azure.spring.integration.servicebus.ServiceBusMessageHandle
import com.microsoft.azure.spring.integration.servicebus.ServiceBusRuntimeException;
import com.microsoft.azure.spring.integration.servicebus.ServiceBusSendTemplate;
import com.microsoft.azure.spring.integration.servicebus.factory.ServiceBusQueueClientFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
@ -33,7 +33,7 @@ import java.util.function.Function;
*/
public class ServiceBusQueueTemplate extends ServiceBusSendTemplate<ServiceBusQueueClientFactory>
implements ServiceBusQueueOperation {
private static final Log LOGGER = LogFactory.getLog(ServiceBusQueueTemplate.class);
private static final Logger LOGGER = LoggerFactory.getLogger(ServiceBusQueueTemplate.class);
private final Map<String, Set<Consumer<Iterable<IMessage>>>> consumersByName = new ConcurrentHashMap<>();
private final Function<String, Checkpointer<IMessage>> checkpointGetter =

6
spring-integration-azure/src/main/java/com/microsoft/azure/spring/integration/servicebus/topic/ServiceBusTopicTemplate.java
Просмотреть файл

@ -15,8 +15,8 @@ import com.microsoft.azure.spring.integration.servicebus.ServiceBusMessageHandle
import com.microsoft.azure.spring.integration.servicebus.ServiceBusRuntimeException;
import com.microsoft.azure.spring.integration.servicebus.ServiceBusSendTemplate;
import com.microsoft.azure.spring.integration.servicebus.factory.ServiceBusTopicClientFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
@ -34,7 +34,7 @@ import java.util.function.Function;
*/
public class ServiceBusTopicTemplate extends ServiceBusSendTemplate<ServiceBusTopicClientFactory>
implements ServiceBusTopicOperation {
private static final Log LOGGER = LogFactory.getLog(ServiceBusTopicTemplate.class);
private static final Logger LOGGER = LoggerFactory.getLogger(ServiceBusTopicTemplate.class);
private final Map<Tuple<String, String>, Set<Consumer<Iterable<IMessage>>>> consumersByNameAndConsumerGroup =
new ConcurrentHashMap<>();