From 77b42b639ff3b8dc7f989cf8a9e65ed102d5105d Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 1 Apr 2014 19:34:40 -0400 Subject: Add sangria-slf4j module. --- sangria-slf4j/pom.xml | 66 +++++++++++++++++++ .../sangria/slf4j/SangriaSlf4jModule.java | 33 ++++++++++ .../sangria/slf4j/Slf4jLoggerProvider.java | 40 ++++++++++++ .../sangria/slf4j/SangriaSlf4jModuleTest.java | 75 ++++++++++++++++++++++ 4 files changed, 214 insertions(+) create mode 100644 sangria-slf4j/pom.xml create mode 100644 sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/SangriaSlf4jModule.java create mode 100644 sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/Slf4jLoggerProvider.java create mode 100644 sangria-slf4j/src/test/java/com/tavianator/sangria/slf4j/SangriaSlf4jModuleTest.java (limited to 'sangria-slf4j') diff --git a/sangria-slf4j/pom.xml b/sangria-slf4j/pom.xml new file mode 100644 index 0000000..8127fbe --- /dev/null +++ b/sangria-slf4j/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + + com.tavianator + sangria + 1.0-SNAPSHOT + + + sangria-slf4j + jar + Sangria SLF4J + SLF4J injection + + + + com.tavianator + sangria-contextual + + + + com.google.inject + guice + + + + org.slf4j + slf4j-api + 1.7.6 + + + + com.google.code.findbugs + jsr305 + true + + + + junit + junit + test + + + + org.hamcrest + hamcrest-integration + test + + + + org.mockito + mockito-core + test + + + + org.slf4j + slf4j-simple + 1.7.6 + test + + + diff --git a/sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/SangriaSlf4jModule.java b/sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/SangriaSlf4jModule.java new file mode 100644 index 0000000..9be0f8a --- /dev/null +++ b/sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/SangriaSlf4jModule.java @@ -0,0 +1,33 @@ +/********************************************************************* + * Sangria * + * Copyright (C) 2014 Tavian Barnes * + * * + * This library is free software. It comes without any warranty, to * + * the extent permitted by applicable law. You can redistribute it * + * and/or modify it under the terms of the Do What The Fuck You Want * + * To Public License, Version 2, as published by Sam Hocevar. See * + * the COPYING file or http://www.wtfpl.net/ for more details. * + *********************************************************************/ + +package com.tavianator.sangria.slf4j; + +import com.google.inject.AbstractModule; +import org.slf4j.Logger; + +import com.tavianator.sangria.contextual.ContextSensitiveBinder; + +/** + * Module for SLF4J {@link Logger} injection. + * + * @author Tavian Barnes (tavianator@tavianator.com) + * @version 1.0 + * @since 1.0 + */ +public class SangriaSlf4jModule extends AbstractModule { + @Override + protected void configure() { + ContextSensitiveBinder.create(binder()) + .bind(Logger.class) + .toContextSensitiveProvider(Slf4jLoggerProvider.class); + } +} diff --git a/sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/Slf4jLoggerProvider.java b/sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/Slf4jLoggerProvider.java new file mode 100644 index 0000000..cae4836 --- /dev/null +++ b/sangria-slf4j/src/main/java/com/tavianator/sangria/slf4j/Slf4jLoggerProvider.java @@ -0,0 +1,40 @@ +/********************************************************************* + * Sangria * + * Copyright (C) 2014 Tavian Barnes * + * * + * This library is free software. It comes without any warranty, to * + * the extent permitted by applicable law. You can redistribute it * + * and/or modify it under the terms of the Do What The Fuck You Want * + * To Public License, Version 2, as published by Sam Hocevar. See * + * the COPYING file or http://www.wtfpl.net/ for more details. * + *********************************************************************/ + +package com.tavianator.sangria.slf4j; + +import javax.inject.Singleton; + +import com.google.inject.spi.InjectionPoint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.tavianator.sangria.contextual.ContextSensitiveProvider; + +/** + * Actual {@link Logger} provider implementation. + * + * @author Tavian Barnes (tavianator@tavianator.com) + * @version 1.0 + * @since 1.0 + */ +@Singleton +class Slf4jLoggerProvider implements ContextSensitiveProvider { + @Override + public Logger getInContext(InjectionPoint injectionPoint) { + return LoggerFactory.getLogger(injectionPoint.getDeclaringType().getRawType()); + } + + @Override + public Logger getInUnknownContext() { + return LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); + } +} diff --git a/sangria-slf4j/src/test/java/com/tavianator/sangria/slf4j/SangriaSlf4jModuleTest.java b/sangria-slf4j/src/test/java/com/tavianator/sangria/slf4j/SangriaSlf4jModuleTest.java new file mode 100644 index 0000000..254584b --- /dev/null +++ b/sangria-slf4j/src/test/java/com/tavianator/sangria/slf4j/SangriaSlf4jModuleTest.java @@ -0,0 +1,75 @@ +/********************************************************************* + * Sangria * + * Copyright (C) 2014 Tavian Barnes * + * * + * This library is free software. It comes without any warranty, to * + * the extent permitted by applicable law. You can redistribute it * + * and/or modify it under the terms of the Do What The Fuck You Want * + * To Public License, Version 2, as published by Sam Hocevar. See * + * the COPYING file or http://www.wtfpl.net/ for more details. * + *********************************************************************/ + +package com.tavianator.sangria.slf4j; + +import javax.inject.Inject; +import javax.inject.Provider; + +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Provides; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.Logger; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + +/** + * Tests for {@link SangriaSlf4jModule}. + * + * @author Tavian Barnes (tavianator@tavianator.com) + * @version 1.0 + * @since 1.0 + */ +public class SangriaSlf4jModuleTest { + @Inject Logger logger; + @Inject Provider provider; + + @Before + public void setUp() { + Guice.createInjector(new SangriaSlf4jModule()).injectMembers(this); + } + + @Test + public void testLogger() { + assertThat(logger.getName(), equalTo("com.tavianator.sangria.slf4j.SangriaSlf4jModuleTest")); + } + + @Test + public void testProvider() { + assertThat(provider.get().getName(), equalTo(Logger.ROOT_LOGGER_NAME)); + } + + @Test + public void testProviderMethod() { + Injector injector = Guice.createInjector(new AbstractModule() { + @Override + protected void configure() { + install(new SangriaSlf4jModule()); + } + + @Provides + String getLoggerName(Logger logger) { + return logger.getName(); + } + }); + + assertThat(injector.getInstance(String.class), equalTo(Logger.ROOT_LOGGER_NAME)); + } + + @Test + public void testDeDuplication() { + Guice.createInjector(new SangriaSlf4jModule(), new SangriaSlf4jModule()); + } +} -- cgit v1.2.3