diff --git a/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffJsonListAbstract.java b/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffJsonListAbstract.java index 70bf6611..7deb7cf9 100644 --- a/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffJsonListAbstract.java +++ b/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffJsonListAbstract.java @@ -24,7 +24,7 @@ public abstract class ProtostuffJsonListAbstract> extends ProtostuffListAbstract { private final ListFormat fmt; - public ProtostuffJsonListAbstract(ListFormat fmt) { + protected ProtostuffJsonListAbstract(ListFormat fmt) { this.fmt = fmt; } diff --git a/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffListAbstract.java b/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffListAbstract.java index 0597eda7..d86d72f2 100644 --- a/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffListAbstract.java +++ b/unknow-server-jaxrs/src/main/java/unknow/server/http/jaxrs/protostuff/ProtostuffListAbstract.java @@ -11,7 +11,6 @@ import jakarta.ws.rs.ext.MessageBodyWriter; public abstract class ProtostuffListAbstract implements MessageBodyReader>, MessageBodyWriter> { - @Override public final boolean isWriteable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { if (!(genericType instanceof ParameterizedType)) diff --git a/unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsMojo.java b/unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsMojo.java index f828134d..cde12662 100644 --- a/unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsMojo.java +++ b/unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsMojo.java @@ -198,8 +198,8 @@ private void generateInitalizer() throws IOException, MojoExecutionException { Utils.list(new ClassExpr(types.get(e.getKey())), new ObjectCreationExpr(null, types.getClass(e.getValue()), Utils.list())))); } - for (String cl : model.protostuffMessage) { - ClassOrInterfaceType type = types.getClass(cl); + for (String clazz : model.protostuffMessage) { + ClassOrInterfaceType type = types.getClass(clazz); b.addStatement(new MethodCallExpr(new TypeExpr(types.get(ProtostuffSchema.class)), "register", Utils.list(new ClassExpr(type), new MethodCallExpr(new ObjectCreationExpr(null, type, Utils.list()), "cachedSchema")))); } diff --git a/unknow-server-maven/src/test/java/unknow/server/maven/TestMaven.java b/unknow-server-maven/src/test/java/unknow/server/maven/TestMaven.java deleted file mode 100644 index b5649550..00000000 --- a/unknow-server-maven/src/test/java/unknow/server/maven/TestMaven.java +++ /dev/null @@ -1,47 +0,0 @@ -package unknow.server.maven; - -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class TestMaven { - private static final Pattern pa = Pattern.compile("\\{\\s*(\\w[\\w\\.\\-]*)\\s*(?::\\s*((?:[^\\{\\}]|\\{[^\\{\\}]*\\})*)\\s*)?\\}"); - - public static void main(String[] arg) { - - String path = "/{q}/list/{t}"; - - StringBuilder sb = new StringBuilder(); - List parts = new ArrayList<>(); - - Matcher m = pa.matcher(path); - int i = 1; - int l = 0; - boolean last = true; - while (m.find()) { - l += m.start() - i; - String s = path.substring(i, m.start()); - sb.append('/').append(s.replaceAll("([\\\\.+*\\[\\{])", "\\$1")); - if (parts != null && !s.isEmpty()) - parts.add(s); -// map.put(m.group(1), map.size()); - if (m.group(2) != null) { - sb.append('(').append(m.group(2)).append(')'); - parts = null; - } else - sb.append("([^/]+)"); - i = m.end() + 1; - } - if (i < path.length()) { - l += path.length() - i; - sb.append('/').append(path.substring(i)); - if (parts != null) { - last = false; - parts.add(path.substring(i)); - } - } - - System.out.println("Parts: " + parts + ", last: " + last + ", pattern: " + sb); - } -}