Skip to content

Commit 0e56f2f

Browse files
author
Ke Wang
committed
Merge branch 'master' of github.com:aol/micro-server
2 parents 74a11ac + 404f2e2 commit 0e56f2f

File tree

7 files changed

+46
-15
lines changed

7 files changed

+46
-15
lines changed

‎micro-boot/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ modifyPom {
1818

1919
groupId 'com.aol.microservices'
2020
artifactId 'microserver-boot'
21-
version '0.5'
21+
version '0.51'
2222

2323
scm {
2424
url 'scm:git@github.com:aol/micro-server.git'

‎micro-boot/src/test/java/app/minimal/com/aol/micro/server/MinimalClassTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@Rest
2222
@Path("/single")
23-
public class MinimalClassTest implements RestResource{
23+
public class MinimalClassTest {
2424

2525
RestAgent rest = new RestAgent();
2626

‎micro-core/src/main/java/com/aol/micro/server/servers/grizzly/FilterConfigurer.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@
99

1010
import org.glassfish.grizzly.servlet.FilterRegistration;
1111
import org.glassfish.grizzly.servlet.WebappContext;
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1214

1315
import com.aol.micro.server.auto.discovery.FilterConfiguration;
16+
import com.aol.micro.server.auto.discovery.ServletConfiguration;
1417
import com.aol.micro.server.servers.model.FilterData;
1518
import com.aol.micro.server.servers.model.ServerData;
19+
import com.aol.micro.server.servers.model.ServletData;
1620
import com.google.common.collect.ImmutableList;
1721

1822
@AllArgsConstructor
1923
public class FilterConfigurer {
20-
24+
private final Logger logger = LoggerFactory.getLogger(getClass());
2125
private final ServerData serverData;
2226
private final ImmutableList<FilterData> filterData;
2327

@@ -33,6 +37,8 @@ private void addAutoDiscoveredFilters(WebappContext webappContext) {
3337
.getRootContext()
3438
.getBeansOfType(FilterConfiguration.class)
3539
.values()
40+
.stream()
41+
.peek(this::logFilter)
3642
.forEach(
3743
filter -> setInitParameters(
3844
webappContext.addFilter(getName(filter),
@@ -49,8 +55,17 @@ private void addExplicitlyDeclaredFilters(WebappContext webappContext) {
4955
filterReg.addMappingForUrlPatterns(
5056
EnumSet.allOf(DispatcherType.class),
5157
filterData.getMapping());
58+
logFilter(filterData);
5259
}
5360
}
61+
private void logFilter(FilterData filter) {
62+
logger.info("Registering {} filter on {}",filter.getFilter().getClass().getName(), filter.getMapping());
63+
64+
}
65+
66+
private void logFilter(FilterConfiguration filter) {
67+
logger.info("Registering {} filter on {}",filter.getClass().getName(),filter.getMapping()[0]);
68+
}
5469

5570
private Class<? extends Filter> getClass(FilterConfiguration filter) {
5671
if (filter.getFilter() != null)

‎micro-core/src/main/java/com/aol/micro/server/servers/grizzly/ServletConfigurer.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,20 @@ private void addAutoDiscoveredServlets(WebappContext webappContext) {
4343

4444
private void addExplicitlyDeclaredServlets(WebappContext webappContext) {
4545
for (ServletData servletData : servletData) {
46-
ServletRegistration filterReg = webappContext.addServlet(
46+
ServletRegistration servletReg = webappContext.addServlet(
4747
servletData.getServletName(), servletData.getServlet());
48-
filterReg.addMapping(servletData.getMapping());
48+
servletReg.addMapping(servletData.getMapping());
49+
logServlet(servletData);
4950
}
5051
}
5152

53+
private void logServlet(ServletData servlet) {
54+
logger.info("Registering {} servlet on {}",servlet.getServlet().getClass().getName(), servlet.getMapping());
55+
56+
}
57+
5258
private void logServlet(ServletConfiguration servlet) {
53-
logger.info("Registering servlet on " + servlet.getMapping()[0]);
54-
;
59+
logger.info("Registering {} servlet on {}",servlet.getClass().getName(), servlet.getMapping()[0]);
5560
}
5661

5762
private Class<? extends Servlet> getServlet(ServletConfiguration servlet) {

‎micro-core/src/main/java/com/aol/micro/server/servers/grizzly/ServletContextListenerConfigurer.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@
77
import lombok.AllArgsConstructor;
88

99
import org.glassfish.grizzly.servlet.WebappContext;
10+
import org.slf4j.Logger;
11+
import org.slf4j.LoggerFactory;
1012
import org.springframework.web.context.ContextLoaderListener;
1113

12-
1314
import com.aol.micro.server.rest.jersey.JerseySpringIntegrationContextListener;
15+
import com.aol.micro.server.servers.model.FilterData;
1416
import com.aol.micro.server.servers.model.ServerData;
1517

1618
@AllArgsConstructor
1719
public class ServletContextListenerConfigurer {
1820

21+
private final Logger logger = LoggerFactory.getLogger(getClass());
1922
private final ServerData serverData;
2023
private final List<ServletContextListener> listenerData;
2124

@@ -24,9 +27,17 @@ public void addListeners(WebappContext webappContext) {
2427
serverData.getRootContext()
2528
.getBeansOfType(ServletContextListener.class)
2629
.values()
30+
31+
.stream()
32+
33+
.peek(this::logListener)
2734
.forEach(listener -> webappContext.addListener(listener));
2835
listenerData.forEach(it -> webappContext.addListener(it));
2936
}
37+
private void logListener(ServletContextListener listener) {
38+
logger.info("Registering servlet context listener {}",listener.getClass().getName());
39+
40+
}
3041

3142

3243

‎micro-core/src/test/java/app/minimal/com/aol/micro/server/MinimalClassTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@Rest
2222
@Path("/single")
23-
public class MinimalClassTest implements RestResource{
23+
public class MinimalClassTest {
2424

2525
RestAgent rest = new RestAgent();
2626

‎readme.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ To make developing, debuging and deploying Java microservices simple.
1717

1818
[Example Apps : Microserver Boot](https://github.com/aol/micro-server/tree/master/micro-boot/src/test/java/app)
1919

20-
[Java Doc : Microserver Core](http://www.javadoc.io/doc/com.aol.microservices/microserver-core/0.5)
20+
[Java Doc : Microserver Core](http://www.javadoc.io/doc/com.aol.microservices/microserver-core/0.51)
2121

22-
[Java Doc : Microserver Boot](http://www.javadoc.io/doc/com.aol.microservices/microserver-core/0.5)
22+
[Java Doc : Microserver Boot](http://www.javadoc.io/doc/com.aol.microservices/microserver-core/0.51)
2323

2424
##Getting started
2525

@@ -40,15 +40,15 @@ Microserver core
4040
<dependency>
4141
<groupId>com.aol.microservices</groupId>
4242
<artifactId>microserver-core</artifactId>
43-
<version>0.5</version>
43+
<version>0.51</version>
4444
</dependency>
4545

4646
Microserver Spring Boot
4747

4848
<dependency>
4949
<groupId>com.aol.microservices</groupId>
5050
<artifactId>microserver-boot</artifactId>
51-
<version>0.5</version>
51+
<version>0.51</version>
5252
</dependency>
5353

5454

@@ -57,11 +57,11 @@ Microserver Spring Boot
5757

5858
Microserver core
5959

60-
compile group: 'com.aol.microservices', name:'microserver-core', version:'0.5'
60+
compile group: 'com.aol.microservices', name:'microserver-core', version:'0.51'
6161

6262
Microserver Spring Boot
6363

64-
compile group: 'com.aol.microservices', name:'microserver-boot', version:'0.5'
64+
compile group: 'com.aol.microservices', name:'microserver-boot', version:'0.51'
6565

6666
##Tech Stack
6767

0 commit comments

Comments
 (0)