lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2018-12-03 09:04:27 +08:00
parent 08ee51f8ab
commit 938e357745
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/redkale/net/sncp/SncpDynServlet.java
View File

@@ -14,6 +14,7 @@ import java.nio.*;
import java.nio.channels.CompletionHandler; import java.nio.channels.CompletionHandler;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.*; import java.util.function.*;
import java.util.logging.*; import java.util.logging.*;
import javax.annotation.*; import javax.annotation.*;
@@ -36,9 +37,9 @@ import org.redkale.service.RpcCall;
*/ */
public final class SncpDynServlet extends SncpServlet { public final class SncpDynServlet extends SncpServlet {
private static volatile int maxClassNameLength = 0; private final AtomicInteger maxClassNameLength;
private static volatile int maxNameLength = 0; private final AtomicInteger maxNameLength;
private static final Logger logger = Logger.getLogger(SncpDynServlet.class.getSimpleName()); private static final Logger logger = Logger.getLogger(SncpDynServlet.class.getSimpleName());
@@ -48,8 +49,11 @@ public final class SncpDynServlet extends SncpServlet {
private Supplier<ByteBuffer> bufferSupplier; private Supplier<ByteBuffer> bufferSupplier;
public SncpDynServlet(final BsonConvert convert, final String serviceName, final Class serviceOrSourceType, final Service service) { public SncpDynServlet(final BsonConvert convert, final String serviceName, final Class serviceOrSourceType, final Service service,
final AtomicInteger maxClassNameLength, AtomicInteger maxNameLength) {
super(serviceName, serviceOrSourceType, service); super(serviceName, serviceOrSourceType, service);
this.maxClassNameLength = maxClassNameLength;
this.maxNameLength = maxNameLength;
this.serviceid = Sncp.hash(type.getName() + ':' + serviceName); this.serviceid = Sncp.hash(type.getName() + ':' + serviceName);
Set<DLong> actionids = new HashSet<>(); Set<DLong> actionids = new HashSet<>();
for (java.lang.reflect.Method method : service.getClass().getMethods()) { for (java.lang.reflect.Method method : service.getClass().getMethods()) {
@@ -70,20 +74,20 @@ public final class SncpDynServlet extends SncpServlet {
actions.put(actionid, action); actions.put(actionid, action);
actionids.add(actionid); actionids.add(actionid);
} }
maxNameLength = Math.max(maxNameLength, serviceName.length() + 1); maxNameLength.set(Math.max(maxNameLength.get(), serviceName.length() + 1));
maxClassNameLength = Math.max(maxClassNameLength, type.getName().length()); maxClassNameLength.set(Math.max(maxClassNameLength.get(), type.getName().length()));
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(this.getClass().getSimpleName()).append(" (type=").append(type.getName()); sb.append(this.getClass().getSimpleName()).append(" (type=").append(type.getName());
int len = maxClassNameLength - type.getName().length(); int len = this.maxClassNameLength.get() - type.getName().length();
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
sb.append(' '); sb.append(' ');
} }
sb.append(", serviceid=").append(serviceid).append(", name='").append(serviceName).append("'"); sb.append(", serviceid=").append(serviceid).append(", name='").append(serviceName).append("'");
for (int i = 0; i < maxNameLength - serviceName.length(); i++) { for (int i = 0; i < this.maxNameLength.get() - serviceName.length(); i++) {
sb.append(' '); sb.append(' ');
} }
sb.append(", actions.size=").append(actions.size() > 9 ? "" : " ").append(actions.size()).append(")"); sb.append(", actions.size=").append(actions.size() > 9 ? "" : " ").append(actions.size()).append(")");

7
src/org/redkale/net/sncp/SncpServer.java
View File

@@ -25,6 +25,10 @@ import org.redkale.util.*;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResponse, SncpServlet> { public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResponse, SncpServlet> {
private final AtomicInteger maxClassNameLength = new AtomicInteger();
private final AtomicInteger maxNameLength = new AtomicInteger();
public SncpServer() { public SncpServer() {
this(System.currentTimeMillis(), ResourceFactory.root()); this(System.currentTimeMillis(), ResourceFactory.root());
} }
@@ -87,7 +91,8 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
} }
public void addSncpServlet(Service sncpService) { public void addSncpServlet(Service sncpService) {
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, maxClassNameLength, maxNameLength);
this.prepare.addServlet(sds, null, Sncp.getConf(sncpService)); this.prepare.addServlet(sds, null, Sncp.getConf(sncpService));
} }