apply mvn formatter:format

SAP · Jul 5, 2019 · dda3801 · dda3801
1 parent fb9ddd5
commit dda3801
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 100 deletions.
diff --git a/spring-xsuaa-mock/src/main/java/com/sap/cloud/security/xsuaa/mock/XsuaaMockWebServer.java b/spring-xsuaa-mock/src/main/java/com/sap/cloud/security/xsuaa/mock/XsuaaMockWebServer.java
@@ -76,7 +76,9 @@ private void intializeMockXsuaa(MockWebServer mockWebServer) {
 			logger.warn(
 					">>>>>>>>>>>Started Xsuaa mock Server that provides public keys for offline JWT Token validation. NEVER run in productive environment!<<<<<<");
 		} catch (IllegalStateException | IOException e) {
-			throw new RuntimeException("Could not start XSUAA mock webserver (localhost:33195). Make sure that it is not yet started in another process.", e);
+			throw new RuntimeException(
+					"Could not start XSUAA mock webserver (localhost:33195). Make sure that it is not yet started in another process.",
+					e);
 		}
 	}
 }
diff --git a/.../java/com/sap/cloud/security/xsuaa/mock/autoconfiguration/XsuaaMockAutoConfiguration.java b/.../java/com/sap/cloud/security/xsuaa/mock/autoconfiguration/XsuaaMockAutoConfiguration.java
@@ -21,21 +21,21 @@
  *
  * <p>
  * can be disabled
- * with @EnableAutoConfiguration(exclude={XsuaaMockAutoConfiguration.class}) or with
- * property spring.xsuaa.mock.auto = false
+ * with @EnableAutoConfiguration(exclude={XsuaaMockAutoConfiguration.class}) or
+ * with property spring.xsuaa.mock.auto = false
  */
 @Configuration
 @ConditionalOnClass(Jwt.class)
 @ConditionalOnProperty(prefix = "spring.xsuaa.mock", name = "auto", havingValue = "true", matchIfMissing = true)
 public class XsuaaMockAutoConfiguration {
-		Logger logger = LoggerFactory.getLogger(getClass());
+	Logger logger = LoggerFactory.getLogger(getClass());
 
-		@Bean
-		@Primary
-		@ConditionalOnProperty(name = "mockxsuaaserver.url", matchIfMissing = false)
-		@ConditionalOnMissingBean(MockXsuaaServiceConfiguration.class)
-		public XsuaaServiceConfiguration xsuaaMockServiceConfiguration() {
-			logger.info("auto-configure MockXsuaaServiceConfiguration");
-			return new MockXsuaaServiceConfiguration();
-		}
+	@Bean
+	@Primary
+	@ConditionalOnProperty(name = "mockxsuaaserver.url", matchIfMissing = false)
+	@ConditionalOnMissingBean(MockXsuaaServiceConfiguration.class)
+	public XsuaaServiceConfiguration xsuaaMockServiceConfiguration() {
+		logger.info("auto-configure MockXsuaaServiceConfiguration");
+		return new MockXsuaaServiceConfiguration();
+	}
 }
diff --git a/...ock/src/test/java/com/sap/cloud/security/xsuaa/mock/XsuaaMockWebServerSpringBootTest.java b/...ock/src/test/java/com/sap/cloud/security/xsuaa/mock/XsuaaMockWebServerSpringBootTest.java
@@ -24,7 +24,8 @@
 
 @RunWith(SpringRunner.class)
 @ActiveProfiles("uaamock")
-@SpringBootTest(classes = { XsuaaMockWebServer.class, XsuaaRequestDispatcher.class, MockXsuaaServiceConfiguration.class })
+@SpringBootTest(classes = { XsuaaMockWebServer.class, XsuaaRequestDispatcher.class,
+		MockXsuaaServiceConfiguration.class })
 public class XsuaaMockWebServerSpringBootTest {
 
 	RestTemplate restTemplate = new RestTemplate();
@@ -34,7 +35,8 @@ public class XsuaaMockWebServerSpringBootTest {
 
 	@Test
 	public void xsuaaMockStarted() throws URISyntaxException {
-		ResponseEntity<String> response = restTemplate.getForEntity(new URI(xsuaaServiceConfiguration.getUaaUrl() + "/token_keys"),
+		ResponseEntity<String> response = restTemplate.getForEntity(
+				new URI(xsuaaServiceConfiguration.getUaaUrl() + "/token_keys"),
 				String.class);
 		Assert.assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
 		Assert.assertThat(response.getBody(), notNullValue());
@@ -61,7 +63,8 @@ public void xsuaaMockReturnsNotFound() throws URISyntaxException {
 	@Test
 	public void xsuaaMockReturnsCustomResponse() throws URISyntaxException {
 		ResponseEntity<String> response = restTemplate
-				.getForEntity(new URI(xsuaaServiceConfiguration.getUaaUrl() + "/customdomain/token_keys"), String.class);
+				.getForEntity(new URI(xsuaaServiceConfiguration.getUaaUrl() + "/customdomain/token_keys"),
+						String.class);
 		Assert.assertThat(response.getStatusCode(), equalTo(HttpStatus.OK));
 		Assert.assertThat(response.getBody(), containsString("legacy-token-key-customdomain"));
 	}

diff --git a/...a/com/sap/cloud/security/xsuaa/mock/autoconfiguration/XsuaaMockAutoConfigurationTest.java b/...a/com/sap/cloud/security/xsuaa/mock/autoconfiguration/XsuaaMockAutoConfigurationTest.java
@@ -25,90 +25,90 @@
 @SpringBootTest(classes = { XsuaaAutoConfiguration.class, XsuaaMockAutoConfiguration.class })
 public class XsuaaMockAutoConfigurationTest {
 
-    // create an ApplicationContextRunner that will create a context with the
-    // configuration under test.
-    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-            .withPropertyValues("mockxsuaaserver.url:http://localhost:12345")
-            .withConfiguration(AutoConfigurations.of(XsuaaAutoConfiguration.class, XsuaaMockAutoConfiguration.class));
-
-    @Autowired
-    private ApplicationContext context;
-
-    @Test
-    public final void autoConfigurationActive() {
-        contextRunner.run((context) -> {
-            assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(true));
-            assertThat(context.getBean("xsuaaMockServiceConfiguration"),
-                    instanceOf(MockXsuaaServiceConfiguration.class));
-            assertThat(context.getBean("xsuaaServiceConfiguration"),
-                    instanceOf(XsuaaServiceConfigurationDefault.class));
-            assertThat(context.getBean(XsuaaServiceConfiguration.class),
-                    instanceOf(MockXsuaaServiceConfiguration.class));
-        });
-    }
-
-    @Test
-    public final void autoConfigurationActiveInclProperties() {
-        contextRunner
-                .withPropertyValues("spring.xsuaa.mock.auto:true").run((context) -> {
-            assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(true));
-            assertThat(context.getBean(XsuaaServiceConfiguration.class),
-                    instanceOf(MockXsuaaServiceConfiguration.class));
-        });
-    }
-
-    @Test
-    public void autoConfigurationDisabledByProperty() {
-        contextRunner.withPropertyValues("spring.xsuaa.mock.auto:false").run((context) -> {
-            assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(false));
-            assertThat(context.getBean(XsuaaServiceConfiguration.class),
-                    instanceOf(XsuaaServiceConfigurationDefault.class));
-        });
-    }
-
-    @Test
-    public void autoConfigurationDisabledWhenNoMockWebServerRunning() {
-        ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-                .withConfiguration(
-                        AutoConfigurations.of(XsuaaAutoConfiguration.class, XsuaaMockAutoConfiguration.class));
-
-        contextRunner.withPropertyValues("spring.xsuaa.mock.auto:false").run((context) -> {
-            assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(false));
-            assertThat(context.getBean(XsuaaServiceConfiguration.class),
-                    instanceOf(XsuaaServiceConfigurationDefault.class));
-        });
-    }
-
-    @Test
-    public final void autoConfigurationWithoutJwtOnClasspathInactive() {
-        contextRunner.withClassLoader(new FilteredClassLoader(Jwt.class)) // removes Jwt.class from classpath
-                .run((context) -> {
-                    assertThat(context.containsBean("xsuaaServiceConfiguration"), is(false));
-                });
-    }
-
-    @Test
-    public final void userConfigurationCanOverrideDefaultBeans() {
-        contextRunner.withUserConfiguration(UserConfiguration.class)
-                .run((context) -> {
-                    assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(false));
-                    assertThat(context.containsBean("customServiceConfiguration"), is(true));
-                    assertThat(context.getBean(XsuaaServiceConfiguration.class),
-                            instanceOf(CustomXsuaaConfiguration.class));
-                });
-    }
-
-    @Configuration
-    public static class UserConfiguration {
-
-        @Bean
-        public MockXsuaaServiceConfiguration customServiceConfiguration() {
-            return new CustomXsuaaConfiguration();
-        }
-    }
-
-    static class CustomXsuaaConfiguration extends MockXsuaaServiceConfiguration {
-
-    }
+	// create an ApplicationContextRunner that will create a context with the
+	// configuration under test.
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withPropertyValues("mockxsuaaserver.url:http://localhost:12345")
+			.withConfiguration(AutoConfigurations.of(XsuaaAutoConfiguration.class, XsuaaMockAutoConfiguration.class));
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public final void autoConfigurationActive() {
+		contextRunner.run((context) -> {
+			assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(true));
+			assertThat(context.getBean("xsuaaMockServiceConfiguration"),
+					instanceOf(MockXsuaaServiceConfiguration.class));
+			assertThat(context.getBean("xsuaaServiceConfiguration"),
+					instanceOf(XsuaaServiceConfigurationDefault.class));
+			assertThat(context.getBean(XsuaaServiceConfiguration.class),
+					instanceOf(MockXsuaaServiceConfiguration.class));
+		});
+	}
+
+	@Test
+	public final void autoConfigurationActiveInclProperties() {
+		contextRunner
+				.withPropertyValues("spring.xsuaa.mock.auto:true").run((context) -> {
+					assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(true));
+					assertThat(context.getBean(XsuaaServiceConfiguration.class),
+							instanceOf(MockXsuaaServiceConfiguration.class));
+				});
+	}
+
+	@Test
+	public void autoConfigurationDisabledByProperty() {
+		contextRunner.withPropertyValues("spring.xsuaa.mock.auto:false").run((context) -> {
+			assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(false));
+			assertThat(context.getBean(XsuaaServiceConfiguration.class),
+					instanceOf(XsuaaServiceConfigurationDefault.class));
+		});
+	}
+
+	@Test
+	public void autoConfigurationDisabledWhenNoMockWebServerRunning() {
+		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+				.withConfiguration(
+						AutoConfigurations.of(XsuaaAutoConfiguration.class, XsuaaMockAutoConfiguration.class));
+
+		contextRunner.withPropertyValues("spring.xsuaa.mock.auto:false").run((context) -> {
+			assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(false));
+			assertThat(context.getBean(XsuaaServiceConfiguration.class),
+					instanceOf(XsuaaServiceConfigurationDefault.class));
+		});
+	}
+
+	@Test
+	public final void autoConfigurationWithoutJwtOnClasspathInactive() {
+		contextRunner.withClassLoader(new FilteredClassLoader(Jwt.class)) // removes Jwt.class from classpath
+				.run((context) -> {
+					assertThat(context.containsBean("xsuaaServiceConfiguration"), is(false));
+				});
+	}
+
+	@Test
+	public final void userConfigurationCanOverrideDefaultBeans() {
+		contextRunner.withUserConfiguration(UserConfiguration.class)
+				.run((context) -> {
+					assertThat(context.containsBean("xsuaaMockServiceConfiguration"), is(false));
+					assertThat(context.containsBean("customServiceConfiguration"), is(true));
+					assertThat(context.getBean(XsuaaServiceConfiguration.class),
+							instanceOf(CustomXsuaaConfiguration.class));
+				});
+	}
+
+	@Configuration
+	public static class UserConfiguration {
+
+		@Bean
+		public MockXsuaaServiceConfiguration customServiceConfiguration() {
+			return new CustomXsuaaConfiguration();
+		}
+	}
+
+	static class CustomXsuaaConfiguration extends MockXsuaaServiceConfiguration {
+
+	}
 
 }