Skip to content

Commit

Permalink
Merge pull request #18 from uavorg/master
Browse files Browse the repository at this point in the history 
update
  • Loading branch information
@lbay2015
lbay2015 committed Nov 14, 2018
2 parents f8930ed + 7475eed commit 1fbc398
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 12 deletions.
28 changes: 27 additions & 1 deletion ...tease.uav.base/src/main/java/com/creditease/agent/profile/api/StandardProfileModeler.java
View file
Expand Up @@ -935,10 +935,36 @@ private void getSpringMVCURLs(String springMVCBaseUrl, Map<String, Set<String>>
/**
* each method has Path info except only one
*/
if (methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.RequestMapping")) {
if (methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.RequestMapping")
|| methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.PostMapping")
|| methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.GetMapping")
|| methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.PutMapping")
|| methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.DeleteMapping")
|| methodAnnoInfo.containsKey("org.springframework.web.bind.annotation.PatchMapping")) {

Map<String, Object> pathAnnoInfo = (Map<String, Object>) methodAnnoInfo
.get("org.springframework.web.bind.annotation.RequestMapping");

if (pathAnnoInfo == null) {
pathAnnoInfo = (Map<String, Object>) methodAnnoInfo
.get("org.springframework.web.bind.annotation.PostMapping");
}
if (pathAnnoInfo == null) {
pathAnnoInfo = (Map<String, Object>) methodAnnoInfo
.get("org.springframework.web.bind.annotation.GetMapping");
}
if (pathAnnoInfo == null) {
pathAnnoInfo = (Map<String, Object>) methodAnnoInfo
.get("org.springframework.web.bind.annotation.PutMapping");
}
if (pathAnnoInfo == null) {
pathAnnoInfo = (Map<String, Object>) methodAnnoInfo
.get("org.springframework.web.bind.annotation.DeleteMapping");
}
if (pathAnnoInfo == null) {
pathAnnoInfo = (Map<String, Object>) methodAnnoInfo
.get("org.springframework.web.bind.annotation.PatchMapping");
}

List<String> methodRelativePaths = (List<String>) pathAnnoInfo.get("value");

Expand Down
8 changes: 8 additions & 0 deletions ...itease.uav.base/src/main/java/com/creditease/agent/spi/AbstractBaseHttpServComponent.java
View file
Expand Up @@ -96,6 +96,7 @@ protected void handleMessage(HttpMessage message) {
/**
* step 2: run http handlers
*/
boolean dispatchFlag = false;
for (AbstractHttpHandler<T> handler : handlers) {

if (!path.equalsIgnoreCase(handler.getContextPath())) {
Expand All @@ -111,9 +112,16 @@ protected void handleMessage(HttpMessage message) {
e);
}

dispatchFlag = true;
break;
}

if (false == dispatchFlag) {
log.warn(this, "NO Matching Handler To Handle This REQUEST, for path: " + path);
message.putResponseBodyInString("NO Matching Handler To Handle This REQUEST, for IP: " + com.creditease.agent.helpers.NetworkHelper.getLocalIP() + ", and path: " + path, 404, "utf-8");
return;
}

/**
* step 3:
*/
Expand Down
2 changes: 1 addition & 1 deletion ...ditease.uav.base/src/main/java/com/creditease/agent/spi/AbstractHttpServiceComponent.java
View file
Expand Up @@ -157,7 +157,7 @@ public AbstractHttpServiceComponent(String cName, String feature, String initHan
@Override
public void start(Executor executor, int port, int backlog) {

start(executor, port, backlog, false);
start(executor, port, backlog, true);

}

Expand Down
4 changes: 2 additions & 2 deletions ...itease.uav.base/src/main/java/com/creditease/agent/spi/AbstractHttpServiceComponent2.java
View file
Expand Up @@ -328,13 +328,13 @@ public void start(int port, int backlog) {
@Override
public void start(int port, int backlog, int listenThreadCount, int handleThreadCount) {

start(port, backlog, listenThreadCount, handleThreadCount, false);
start(port, backlog, listenThreadCount, handleThreadCount, true);
}

@Override
public void start(Executor executor, int port, int backlog) {

start(executor, port, backlog, false);
start(executor, port, backlog, true);
}

@Override
Expand Down
50 changes: 42 additions & 8 deletions ...ramework/src/main/java/com/creditease/uav/profiling/handlers/ComponentProfileHandler.java
View file
Expand Up @@ -911,10 +911,10 @@ private String getImplClassAsKey(String key, Node jaxws, ClassLoader cl, String

Node beanClazz = processor
.selectXMLNode("/beans/bean[@id='" + impl.getNodeValue() + "']/@class");
if(beanClazz!=null) {

if (beanClazz != null) {
return beanClazz.getNodeValue();
}
}
}

// step 2.3 load serviceBean|implementor/@ref
Expand All @@ -925,9 +925,9 @@ private String getImplClassAsKey(String key, Node jaxws, ClassLoader cl, String
Node beanClazz = processor
.selectXMLNode("/beans/bean[@id='" + impl.getNodeValue() + "']/@class");

if(beanClazz!=null) {
if (beanClazz != null) {
return beanClazz.getNodeValue();
}
}
}

return key;
Expand Down Expand Up @@ -1959,8 +1959,21 @@ public Map<String, Object> process(Class annoCls, Class<?> comCls, ProfileContex

getClassAnnoInfo(comCls, info, annoClasses);

// load methodAnno class
Class[] methodAnnoClasses = this.loadAnnoClasses(context,
"org.springframework.web.bind.annotation.RequestMapping",
"org.springframework.web.bind.annotation.PostMapping",
"org.springframework.web.bind.annotation.GetMapping",
"org.springframework.web.bind.annotation.PutMapping",
"org.springframework.web.bind.annotation.DeleteMapping",
"org.springframework.web.bind.annotation.PatchMapping");

if (null == methodAnnoClasses || methodAnnoClasses.length == 0) {
return info;
}

// get method info
getMethodInfo(comCls, info, annoClasses[annoClasses.length - 1]);
getMethodInfo(comCls, info, methodAnnoClasses);

return info;
}
Expand Down Expand Up @@ -2643,6 +2656,27 @@ else if (classPathAnnoClass.equals("org.springframework.web.bind.annotation.Requ

Map<String, Object> methodPathAnno = (Map<String, Object>) methodAnno.get(methodPathAnnoClass);

if (methodPathAnno == null) {
methodPathAnno = (Map<String, Object>) methodAnno
.get("org.springframework.web.bind.annotation.PostMapping");
}
if (methodPathAnno == null) {
methodPathAnno = (Map<String, Object>) methodAnno
.get("org.springframework.web.bind.annotation.GetMapping");
}
if (methodPathAnno == null) {
methodPathAnno = (Map<String, Object>) methodAnno
.get("org.springframework.web.bind.annotation.PutMapping");
}
if (methodPathAnno == null) {
methodPathAnno = (Map<String, Object>) methodAnno
.get("org.springframework.web.bind.annotation.DeleteMapping");
}
if (methodPathAnno == null) {
methodPathAnno = (Map<String, Object>) methodAnno
.get("org.springframework.web.bind.annotation.PatchMapping");
}

if (methodPathAnno == null) {
continue;
}
Expand Down Expand Up @@ -2928,8 +2962,8 @@ private void getDynInfoForWebService(String componentClassName, ProfileElementIn
Class<?> annoClass = annoAvailableClasses.get(componentClassName);
if (null == annoClass) {
return;
}
}

List<String> coms = fcs.getNamesOfClassesWithAnnotation(annoClass);

if (null == coms || coms.isEmpty()) {
Expand Down

0 comments on commit 1fbc398

Please sign in to comment.