Andy Wilkinson
11 years ago
27 changed files with 27 additions and 661 deletions
@ -1,55 +0,0 @@
@@ -1,55 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.actuate.endpoint; |
||||
|
||||
import java.util.Collection; |
||||
import java.util.LinkedHashSet; |
||||
|
||||
import org.springframework.boot.actuate.metrics.Metric; |
||||
import org.springframework.boot.actuate.metrics.reader.MetricReader; |
||||
import org.springframework.util.Assert; |
||||
|
||||
/** |
||||
* Default implementation of {@link PublicMetrics} that exposes all metrics from a |
||||
* {@link MetricReader} along with memory information. |
||||
* |
||||
* @author Dave Syer |
||||
* @author Christian Dupuis |
||||
* @deprecated since 1.2 in favor of {@link SystemPublicMetrics}, |
||||
* {@code MetricReaderPublicMetrics} |
||||
*/ |
||||
@Deprecated |
||||
public class VanillaPublicMetrics extends SystemPublicMetrics { |
||||
|
||||
private final MetricReader reader; |
||||
|
||||
public VanillaPublicMetrics(MetricReader reader) { |
||||
Assert.notNull(reader, "MetricReader must not be null"); |
||||
this.reader = reader; |
||||
} |
||||
|
||||
@Override |
||||
public Collection<Metric<?>> metrics() { |
||||
Collection<Metric<?>> result = new LinkedHashSet<Metric<?>>(); |
||||
for (Metric<?> metric : this.reader.findAll()) { |
||||
result.add(metric); |
||||
} |
||||
result.addAll(super.metrics()); |
||||
return result; |
||||
} |
||||
|
||||
} |
||||
@ -1,53 +0,0 @@
@@ -1,53 +0,0 @@
|
||||
/* |
||||
* Copyright 2010-2014 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.boot.actuate.system; |
||||
|
||||
import java.io.File; |
||||
|
||||
import org.springframework.boot.context.event.ApplicationStartedEvent; |
||||
|
||||
/** |
||||
* An {@link org.springframework.context.ApplicationListener} that saves application PID |
||||
* into file. This application listener will be triggered exactly once per JVM, and the |
||||
* file name can be overridden at runtime with a System property or environment variable |
||||
* named "PIDFILE" (or "pidfile"). |
||||
* |
||||
* @author Jakub Kubrynski |
||||
* @author Dave Syer |
||||
* @author Phillip Webb |
||||
* @since 1.0.2 |
||||
* @deprecated since 1.2.0 in favor of {@link ApplicationPidFileWriter} |
||||
*/ |
||||
@Deprecated |
||||
public class ApplicationPidListener extends ApplicationPidFileWriter { |
||||
|
||||
public ApplicationPidListener() { |
||||
super(); |
||||
setTriggerEventType(ApplicationStartedEvent.class); |
||||
} |
||||
|
||||
public ApplicationPidListener(File file) { |
||||
super(file); |
||||
setTriggerEventType(ApplicationStartedEvent.class); |
||||
} |
||||
|
||||
public ApplicationPidListener(String filename) { |
||||
super(filename); |
||||
setTriggerEventType(ApplicationStartedEvent.class); |
||||
} |
||||
|
||||
} |
||||
@ -1,81 +0,0 @@
@@ -1,81 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.actuate.endpoint; |
||||
|
||||
import java.util.Date; |
||||
import java.util.HashMap; |
||||
import java.util.Map; |
||||
|
||||
import org.junit.Test; |
||||
import org.springframework.boot.actuate.metrics.Metric; |
||||
import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository; |
||||
|
||||
import static org.hamcrest.Matchers.equalTo; |
||||
import static org.junit.Assert.assertThat; |
||||
import static org.junit.Assert.assertTrue; |
||||
|
||||
/** |
||||
* Tests for {@link VanillaPublicMetrics}. |
||||
* |
||||
* @author Phillip Webb |
||||
* @author Christian Dupuis |
||||
*/ |
||||
@Deprecated |
||||
public class VanillaPublicMetricsTests { |
||||
|
||||
@Test |
||||
public void testMetrics() throws Exception { |
||||
InMemoryMetricRepository repository = new InMemoryMetricRepository(); |
||||
repository.set(new Metric<Double>("a", 0.5, new Date())); |
||||
VanillaPublicMetrics publicMetrics = new VanillaPublicMetrics(repository); |
||||
Map<String, Metric<?>> results = new HashMap<String, Metric<?>>(); |
||||
for (Metric<?> metric : publicMetrics.metrics()) { |
||||
results.put(metric.getName(), metric); |
||||
} |
||||
assertTrue(results.containsKey("mem")); |
||||
assertTrue(results.containsKey("mem.free")); |
||||
assertThat(results.get("a").getValue().doubleValue(), equalTo(0.5)); |
||||
} |
||||
|
||||
@Test |
||||
public void testSystemMetrics() throws Exception { |
||||
InMemoryMetricRepository repository = new InMemoryMetricRepository(); |
||||
repository.set(new Metric<Double>("a", 0.5, new Date())); |
||||
VanillaPublicMetrics publicMetrics = new VanillaPublicMetrics(repository); |
||||
Map<String, Metric<?>> results = new HashMap<String, Metric<?>>(); |
||||
for (Metric<?> metric : publicMetrics.metrics()) { |
||||
results.put(metric.getName(), metric); |
||||
} |
||||
assertTrue(results.containsKey("mem")); |
||||
assertTrue(results.containsKey("mem.free")); |
||||
assertTrue(results.containsKey("processors")); |
||||
assertTrue(results.containsKey("uptime")); |
||||
|
||||
assertTrue(results.containsKey("heap.committed")); |
||||
assertTrue(results.containsKey("heap.init")); |
||||
assertTrue(results.containsKey("heap.used")); |
||||
assertTrue(results.containsKey("heap")); |
||||
|
||||
assertTrue(results.containsKey("threads.peak")); |
||||
assertTrue(results.containsKey("threads.daemon")); |
||||
assertTrue(results.containsKey("threads")); |
||||
|
||||
assertTrue(results.containsKey("classes.loaded")); |
||||
assertTrue(results.containsKey("classes.unloaded")); |
||||
assertTrue(results.containsKey("classes")); |
||||
} |
||||
} |
||||
@ -1,67 +0,0 @@
@@ -1,67 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.autoconfigure.groovy.template; |
||||
|
||||
import groovy.text.markup.MarkupTemplateEngine; |
||||
import groovy.text.markup.TemplateConfiguration; |
||||
import groovy.text.markup.TemplateResolver; |
||||
|
||||
import java.io.IOException; |
||||
import java.net.URL; |
||||
|
||||
import org.springframework.context.i18n.LocaleContextHolder; |
||||
import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer; |
||||
import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver; |
||||
|
||||
/** |
||||
* A custom {@link groovy.text.markup.TemplateResolver template resolver} which resolves |
||||
* templates using the locale found in the thread locale. This resolver ignores the |
||||
* template engine configuration locale. |
||||
* |
||||
* @author Cédric Champeau |
||||
* @since 1.1.0 |
||||
* @deprecated since 1.2 in favor of Spring 4.1's {@link GroovyMarkupViewResolver} and |
||||
* {@link GroovyMarkupConfigurer}. |
||||
*/ |
||||
@Deprecated |
||||
public class GroovyTemplateResolver implements TemplateResolver { |
||||
|
||||
private ClassLoader templateClassLoader; |
||||
|
||||
@Override |
||||
public void configure(final ClassLoader templateClassLoader, |
||||
final TemplateConfiguration configuration) { |
||||
this.templateClassLoader = templateClassLoader; |
||||
} |
||||
|
||||
@Override |
||||
public URL resolveTemplate(final String templatePath) throws IOException { |
||||
MarkupTemplateEngine.TemplateResource templateResource = MarkupTemplateEngine.TemplateResource |
||||
.parse(templatePath); |
||||
URL resource = this.templateClassLoader.getResource(templateResource.withLocale( |
||||
LocaleContextHolder.getLocale().toString().replace("-", "_")).toString()); |
||||
if (resource == null) { |
||||
// no resource found with the default locale, try without any locale
|
||||
resource = this.templateClassLoader.getResource(templateResource.withLocale( |
||||
null).toString()); |
||||
} |
||||
if (resource == null) { |
||||
throw new IOException("Unable to load template:" + templatePath); |
||||
} |
||||
return resource; |
||||
} |
||||
|
||||
} |
||||
@ -1,78 +0,0 @@
@@ -1,78 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.autoconfigure.web; |
||||
|
||||
import org.apache.commons.logging.Log; |
||||
import org.apache.commons.logging.LogFactory; |
||||
import org.springframework.boot.autoconfigure.jackson.JacksonProperties; |
||||
import org.springframework.boot.context.properties.ConfigurationProperties; |
||||
import org.springframework.http.converter.HttpMessageConverter; |
||||
|
||||
import com.fasterxml.jackson.databind.SerializationFeature; |
||||
|
||||
/** |
||||
* Configuration properties to configure {@link HttpMessageConverter}s. |
||||
* |
||||
* @author Dave Syer |
||||
* @author Piotr Maj |
||||
* @author Sebastien Deleuze |
||||
* @deprecated in 1.2.0 favor of {@link JacksonProperties} |
||||
*/ |
||||
@ConfigurationProperties(prefix = "http.mappers", ignoreUnknownFields = false) |
||||
@Deprecated |
||||
public class HttpMapperProperties { |
||||
|
||||
private final Log logger = LogFactory.getLog(HttpMapperProperties.class); |
||||
|
||||
/** |
||||
* Enable json pretty print. |
||||
*/ |
||||
private Boolean jsonPrettyPrint; |
||||
|
||||
/** |
||||
* Enable key sorting. |
||||
*/ |
||||
private Boolean jsonSortKeys; |
||||
|
||||
public void setJsonPrettyPrint(Boolean jsonPrettyPrint) { |
||||
this.logger.warn(getDeprecationMessage("http.mappers.json-pretty-print", |
||||
SerializationFeature.INDENT_OUTPUT)); |
||||
this.jsonPrettyPrint = jsonPrettyPrint; |
||||
} |
||||
|
||||
public Boolean isJsonPrettyPrint() { |
||||
return this.jsonPrettyPrint; |
||||
} |
||||
|
||||
public void setJsonSortKeys(Boolean jsonSortKeys) { |
||||
this.logger.warn(getDeprecationMessage("http.mappers.json-sort-keys", |
||||
SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)); |
||||
this.jsonSortKeys = jsonSortKeys; |
||||
} |
||||
|
||||
public Boolean isJsonSortKeys() { |
||||
return this.jsonSortKeys; |
||||
} |
||||
|
||||
private String getDeprecationMessage(String property, |
||||
SerializationFeature alternativeFeature) { |
||||
return String.format("%s is deprecated. If you are using Jackson," |
||||
+ " spring.jackson.serialization.%s=true should be used instead.", |
||||
property, alternativeFeature.name()); |
||||
} |
||||
|
||||
} |
||||
@ -1,38 +0,0 @@
@@ -1,38 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.groovy; |
||||
|
||||
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.springframework.boot.cli.compiler.autoconfigure.JmsCompilerAutoConfiguration; |
||||
|
||||
/** |
||||
* Pseudo annotation used to trigger {@link JmsCompilerAutoConfiguration}. |
||||
* |
||||
* @deprecated since 1.2.0 in favor of {@code EnableJms} |
||||
*/ |
||||
@Target(ElementType.TYPE) |
||||
@Documented |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@Deprecated |
||||
public @interface EnableJmsMessaging { |
||||
|
||||
} |
||||
@ -1,38 +0,0 @@
@@ -1,38 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.groovy; |
||||
|
||||
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.springframework.boot.cli.compiler.autoconfigure.RabbitCompilerAutoConfiguration; |
||||
|
||||
/** |
||||
* Pseudo annotation used to trigger {@link RabbitCompilerAutoConfiguration}. |
||||
* |
||||
* @deprecated since 1.2.0 in favor of {@code EnableRabbit} |
||||
*/ |
||||
@Target(ElementType.TYPE) |
||||
@Documented |
||||
@Retention(RetentionPolicy.RUNTIME) |
||||
@Deprecated |
||||
public @interface EnableRabbitMessaging { |
||||
|
||||
} |
||||
@ -1,32 +0,0 @@
@@ -1,32 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.json; |
||||
|
||||
/** |
||||
* Really basic JSON parser for when you have nothing else available. Comes with some |
||||
* limitations with respect to the JSON specification (e.g. only supports String values), |
||||
* so users will probably prefer to have a library handle things instead (Jackson or Snake |
||||
* YAML are supported). |
||||
* |
||||
* @author Dave Syer |
||||
* @see JsonParserFactory |
||||
* @deprecated since 1.2.0 in favor of {@link BasicJsonParser}. |
||||
*/ |
||||
@Deprecated |
||||
public class SimpleJsonParser extends BasicJsonParser { |
||||
|
||||
} |
||||
@ -1,33 +0,0 @@
@@ -1,33 +0,0 @@
|
||||
/* |
||||
* Copyright 2012-2014 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.boot.orm.jpa; |
||||
|
||||
import org.hibernate.cfg.NamingStrategy; |
||||
|
||||
/** |
||||
* Hibernate {@link NamingStrategy} that follows Spring recommended naming conventions. |
||||
* |
||||
* @author Phillip Webb |
||||
* @deprecated Since 1.2.0 in favor of |
||||
* {@link org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy} |
||||
*/ |
||||
@Deprecated |
||||
@SuppressWarnings("serial") |
||||
public class SpringNamingStrategy extends |
||||
org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy { |
||||
|
||||
} |
||||
Loading…
Reference in new issue