Merge pull request #176 from zalando-nakadi/bugfix-no-stups-token-bean

Bugfix: no stups token bean if not needed

* adding test
* don't create the StupsTokenComponent when not needed
* don't create it in the NakadiClientEncodingIT either.

nakadi-producer-spring-boot-starter/src/main/java/org/zalando/nakadiproducer/NakadiProducerAutoConfiguration.java

@@ -65,6 +65,7 @@ public NakadiPublishingClient nakadiProducerPublishingClient(AccessTokenProvider
         }
 
         @ConditionalOnClass(name = "org.zalando.stups.tokens.Tokens")
+        @ConditionalOnMissingBean({NakadiPublishingClient.class, NakadiClient.class})
         @Configuration
         static class StupsTokenConfiguration {
             @Bean(destroyMethod = "stop")

nakadi-producer-spring-boot-starter/src/test/java/org/zalando/nakadiproducer/EndToEndTestIT.java

@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.ContextConfiguration;
 import org.zalando.nakadiproducer.eventlog.CompactionKeyExtractor;
@@ -39,13 +40,21 @@ public class EndToEndTestIT extends BaseMockedExternalCommunicationIT {
     @Autowired
     private MockNakadiPublishingClient nakadiClient;
 
+    @Autowired
+    ApplicationContext context;
+
     @BeforeEach
     @AfterEach
     public void clearNakadiEvents() {
         eventTransmitter.sendEvents();
         nakadiClient.clearSentEvents();
     }
 
+    @Test
+    public void noStupsTokenBeanIsSetupWithMockPublishingClient() {
+        assertThat(context.getBeanProvider(StupsTokenComponent.class).getIfAvailable(), is(nullValue()));
+    }
+
     @Test
     public void dataEventsShouldBeSubmittedToNakadi() throws IOException {
         MockPayload payload = Fixture.mockPayload(1, CODE);

nakadi-producer-spring-boot-starter/src/test/java/org/zalando/nakadiproducer/NakadiClientContentEncodingIT.java

@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.zalando.fahrschein.http.api.ContentEncoding;
 import org.zalando.fahrschein.http.api.RequestFactory;
 import org.zalando.nakadiproducer.config.EmbeddedDataSourceConfig;
@@ -25,6 +26,11 @@
 )
 public class NakadiClientContentEncodingIT {
 
+    // Avoid errors in the logs from the AccessTokenRefresher. As we are not actually submitting
+    // to Nakadi, this will never be used.
+    @MockBean
+    private AccessTokenProvider tokenProvider;
+
     @Autowired
     private RequestFactory requestFactory;