This commit is contained in:
Redkale
2017-06-03 22:32:47 +08:00
parent 7f3776c224
commit 023a9abdef
4 changed files with 4 additions and 35 deletions

View File

@@ -19,7 +19,7 @@ import org.redkale.util.*;
* @param <R> Request的子类型 * @param <R> Request的子类型
* @param <P> Response的子类型 * @param <P> Response的子类型
*/ */
public abstract class Filter<C extends Context, R extends Request<C>, P extends Response<C, R>> implements Comparable, Resourcable { public abstract class Filter<C extends Context, R extends Request<C>, P extends Response<C, R>> implements Comparable {
AnyValue _conf; //当前Filter的配置 AnyValue _conf; //当前Filter的配置
@@ -33,11 +33,6 @@ public abstract class Filter<C extends Context, R extends Request<C>, P extends
public void destroy(C context, AnyValue config) { public void destroy(C context, AnyValue config) {
} }
@Override
public String resourceName() {
return "";
}
/** /**
* 值越小越靠前执行 * 值越小越靠前执行
* *
@@ -48,7 +43,7 @@ public abstract class Filter<C extends Context, R extends Request<C>, P extends
} }
@Override @Override
public int compareTo(Object o) { public final int compareTo(Object o) {
if (!(o instanceof Filter)) return 1; if (!(o instanceof Filter)) return 1;
return this.getIndex() - ((Filter) o).getIndex(); return this.getIndex() - ((Filter) o).getIndex();
} }

View File

@@ -139,10 +139,6 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
return removeFilter(f -> filterClass.equals(f.getClass())); return removeFilter(f -> filterClass.equals(f.getClass()));
} }
public Filter<C, R, P> removeFilter(String filterName) {
return removeFilter(f -> filterName.equals(f.resourceName()));
}
public Filter<C, R, P> removeFilter(Predicate<Filter<C, R, P>> predicate) { public Filter<C, R, P> removeFilter(Predicate<Filter<C, R, P>> predicate) {
if (this.headFilter == null || predicate == null) return null; if (this.headFilter == null || predicate == null) return null;
synchronized (filters) { synchronized (filters) {

View File

@@ -47,17 +47,6 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
return ((HttpPrepareServlet) this.prepare).resourceHttpServlet; return ((HttpPrepareServlet) this.prepare).resourceHttpServlet;
} }
/**
* 删除HttpFilter
*
* @param filterName HttpFilter名称
*
* @return HttpFilter
*/
public HttpFilter removeFilter(String filterName) {
return (HttpFilter) this.prepare.removeFilter(filterName);
}
/** /**
* 删除HttpServlet * 删除HttpServlet
* *
@@ -72,7 +61,7 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
/** /**
* 删除HttpServlet * 删除HttpServlet
* *
* @param <T> 泛型 * @param <T> 泛型
* @param websocketOrServletType Class * @param websocketOrServletType Class
* *
* @return HttpServlet * @return HttpServlet

View File

@@ -37,17 +37,6 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
super.init(config); super.init(config);
} }
/**
* 删除SncpFilter
*
* @param filterName SncpFilter名称
*
* @return SncpFilter
*/
public SncpFilter removeFilter(String filterName) {
return (SncpFilter) this.prepare.removeFilter(filterName);
}
/** /**
* 删除SncpFilter * 删除SncpFilter
* *
@@ -88,7 +77,7 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
SncpDynServlet sds = new SncpDynServlet(BsonFactory.root().getConvert(), Sncp.getResourceName(sncpService), Sncp.getResourceType(sncpService), sncpService); SncpDynServlet sds = new SncpDynServlet(BsonFactory.root().getConvert(), Sncp.getResourceName(sncpService), Sncp.getResourceType(sncpService), sncpService);
this.prepare.addServlet(sds, null, Sncp.getConf(sncpService)); this.prepare.addServlet(sds, null, Sncp.getConf(sncpService));
} }
public List<SncpServlet> getSncpServlets() { public List<SncpServlet> getSncpServlets() {
return ((SncpPrepareServlet) this.prepare).getSncpServlets(); return ((SncpPrepareServlet) this.prepare).getSncpServlets();
} }