Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Numerous changes to actuator

Browse Source 
Numerous changes to the actuator project, including:
- Specific Endpoint interface
- Spring MVC/Enpoint adapter
- Management server context changes
- Consistent auto-configuration class naming
- Auto-configuration ordering
- Javadoc, code formatting and tests
This commit is contained in:
Phillip Webb
2013-06-12 14:00:22 -07:00
parent dd69d0f660
commit 8c347fc99b
121 changed files with 3428 additions and 2404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnApplicationContext.java
View File

@@ -1,51 +0,0 @@
/*
* Copyright 2012-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.context.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.catalina.core.ApplicationContext;
import org.springframework.context.annotation.Conditional;
/**
* {@link Conditional} that only matches specific {@link ApplicationContext}s and that can
* optionally create them.
*
* @author Phillip Webb
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnApplicationContextCondition.class)
public @interface ConditionalOnApplicationContext {
// FIXME complete of delete this
/**
* The ID of the application context.
*/
String value() default "";
// FIXME Strategy Interface Class, eg ApplicationContextCondition
// condition=SomethingSpecific.class
boolean createIfMissing() default false;
}

66
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnApplicationContextCondition.java
View File

@@ -1,66 +0,0 @@
/*
* Copyright 2012-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.context.annotation;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* @author Phillip Webb
*/
public class OnApplicationContextCondition implements Condition {
// FIXME complete or delete
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
AnnotationAttributes attributes = AnnotationAttributes
.fromMap(metadata
.getAnnotationAttributes(ConditionalOnApplicationContext.class
.getName()));
String id = (String) attributes.get("value");
boolean createIfMissing = attributes.getBoolean("createIfMissing");
ApplicationContext applicationContext = context.getApplicationContext();
if (applicationContext != null) {
if (StringUtils.hasLength(id) && applicationContext.getId().equals(id)) {
return true;
}
}
if (createIfMissing) {
registerCreate(applicationContext, metadata);
}
return false;
}
/**
* @param applicationContext
* @param metadata
*/
private void registerCreate(ApplicationContext applicationContext,
AnnotatedTypeMetadata metadata) {
Assert.notNull(applicationContext,
"Unable to create ApplicationContext from @ConditionalOnApplicationContext");
}
}

124
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnApplicationContextConditionTest.java
View File

@@ -1,124 +0,0 @@
/*
* Copyright 2012-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.context.annotation;
import java.util.HashSet;
import java.util.Set;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.util.ObjectUtils;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
/**
* Tests for {@link OnApplicationContextCondition}.
*
* @author Phillip Webb
*/
@SuppressWarnings("resource")
public class OnApplicationContextConditionTest {
@Test
public void forContextById() throws Exception {
AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
parent.setId("parent");
parent.register(ForContextByIdConf.class);
AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
child.setId("child");
child.setParent(parent);
child.register(ForContextByIdConf.class);
parent.refresh();
child.refresh();
assertThat(parent.containsLocalBean("inParent"), equalTo(true));
assertThat(parent.containsLocalBean("inChild"), equalTo(false));
assertThat(child.containsLocalBean("inParent"), equalTo(false));
assertThat(child.containsLocalBean("inChild"), equalTo(true));
}
@Test
@Ignore
public void createContext() throws Exception {
AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
ApplicationContextCollector collector = new ApplicationContextCollector();
parent.addApplicationListener(collector);
parent.register(CreateContext.class);
parent.refresh();
assertThat(collector.get("child").containsLocalBean("inChild"), equalTo(true));
}
// FIXME
// createContextOnBeanMethod
// createContextComponent
private static class ApplicationContextCollector implements
ApplicationListener<ContextRefreshedEvent> {
private Set<ApplicationContext> contexts = new HashSet<ApplicationContext>();
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
this.contexts.add(event.getApplicationContext());
}
public ApplicationContext get(String id) {
for (ApplicationContext context : this.contexts) {
if (ObjectUtils.nullSafeEquals(context.getId(), id)) {
return context;
}
}
throw new IllegalArgumentException("No such ID " + id);
}
}
@Configuration
public static class ForContextByIdConf {
@Bean
@ConditionalOnApplicationContext("parent")
public String inParent() {
return "inParent";
}
@Bean
@ConditionalOnApplicationContext("child")
public String inChild() {
return "inChild";
}
}
@Configuration
@ConditionalOnApplicationContext(value = "child", createIfMissing = true)
public static class CreateContext {
@Bean
public String inChild() {
return "inChild";
}
}
}