Fix #93 Do not require nakadi-producer.access-token-uri anymore

Author: BGehrels

README.md

@@ -116,13 +116,9 @@ token. The easiest way to do so is to include the [Zalando Tokens library](https
 </dependency>
 ```
 
-This starter will detect and auto configure it. To do so, it needs to know the address of your oAuth2 server:
-```yaml
-nakadi-producer:
-  access-token-uri: https://token.auth.example.org/oauth2/access_token
-```
+This starter will detect and auto configure it.
 
-If your application is running in Zalando's Kubernetes environment, you also have to configure the credential rotation:
+If your application is running in Zalando's Kubernetes environment, you have to configure the credential rotation:
 ```yaml
 apiVersion: "zalando.org/v1"
 kind: PlatformCredentialsSet
@@ -136,18 +132,27 @@ spec:
        privileges: []
 ``` 
 
+If your application is running in Zalando's STUPS environment (or you provide tokens via your own oAuth server) it needs
+to know the address of your oAuth2 server:
+```yaml
+nakadi-producer:
+ access-token-uri: https://token.auth.example.org/oauth2/access_token
+```
+
+#### OAuth (scope) configuration in a non-Zalando environment
+Please consult the [manual of Zalando's tokens library](https://github.com/zalando/tokens) for more configuration options (like `CREDENTIALS_DIR` or via environment variables.
+
 Since [July 2017](https://github.com/zalando/nakadi/pull/692), Nakadi (at least in the version operated at Zalando) doesn't require any scopes other than the pseudo-scope `uid` for writing events, [the authorization is instead based on event-type configuration using the service's uid](https://nakadi.io/manual.html#using_authorization).
 
 If your Nakadi installation needs real scopes for submitting events, you can provide them via configuration, too (as a comma-separated list):
 
 ```yaml
 nakadi-producer:
-  access-token-uri: https://token.auth.example.org/oauth2/access_token
   access-token-scopes: my.scope.name,other.scope.name
-```
-
-If you do not use the STUPS Tokens library, you can implement token retrieval yourself by defining a Spring bean of type `org.zalando.nakadiproducer.AccessTokenProvider`. The starter will detect it and call it once for each request to retrieve the token. 
+``` 
 
+#### Implement Nakadi authentication yourself
+If you do not use the STUPS Tokens library, you can implement token retrieval yourself by defining a Spring bean of type `org.zalando.nakadiproducer.AccessTokenProvider`. The starter will detect it and call it once for each request to retrieve the token.
 
 ### Creating events
 

nakadi-producer-spring-boot-starter/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>nakadi-producer-reactor</artifactId>
-        <version>20.0.0</version>
+        <version>20.0.1</version>
     </parent>
 
     <artifactId>nakadi-producer-spring-boot-starter</artifactId>

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

@@ -57,10 +57,9 @@ public NakadiPublishingClient nakadiProducerPublishingClient(AccessTokenProvider
         @Configuration
         static class StupsTokenConfiguration {
             @Bean(destroyMethod = "stop")
-            @ConditionalOnProperty({ "nakadi-producer.access-token-uri" })
             @ConditionalOnMissingBean(AccessTokenProvider.class)
             public StupsTokenComponent accessTokenProvider(
-                    @Value("${nakadi-producer.access-token-uri}") URI accessTokenUri,
+                    @Value("${nakadi-producer.access-token-uri:http://nakadi-producer.access-token-uri.not-set}") URI accessTokenUri,
                     @Value("${nakadi-producer.access-token-scopes:uid}") String[] accessTokenScopes) {
                 return new StupsTokenComponent(accessTokenUri, Arrays.asList(accessTokenScopes));
             }

nakadi-producer-starter-spring-boot-2-test/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>nakadi-producer-reactor</artifactId>
-        <version>20.0.0</version>
+        <version>20.0.1</version>
     </parent>
 
     <dependencies>

nakadi-producer-starter-spring-boot-2-test/src/main/resources/application.yml

@@ -1,4 +1,3 @@
 nakadi-producer:
-  access-token-uri: http://localhost:1234
   nakadi-base-uri: https://nakadi.example.org:5432
 management.endpoints.web.exposure.include: snapshot-event-creation

nakadi-producer/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.zalando</groupId>
         <artifactId>nakadi-producer-reactor</artifactId>
-        <version>20.0.0</version>
+        <version>20.0.1</version>
     </parent>
 
     <artifactId>nakadi-producer</artifactId>

pom.xml

@@ -15,7 +15,7 @@
 
     <artifactId>nakadi-producer-reactor</artifactId>
     <groupId>org.zalando</groupId>
-    <version>20.0.0</version>
+    <version>20.0.1</version>
     <packaging>pom</packaging>
     <name>Nakadi Event Producer Reactor</name>