Skip to content

Commit efa8fd3

Browse files
kklisurakklisura
committed
Extract protocol to cdt-protocol-parser
1 parent 2f71269 commit efa8fd3

File tree

60 files changed

+302
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+302
-223
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ RUN_JAR=$(JAVA) -jar
66

77
JAVA_PROTOCOL_BUILDER_DIR=cdt-java-protocol-builder
88
JAVA_PROTOCOL_BUILDER_JAR="$(JAVA_PROTOCOL_BUILDER_DIR)/target/cdt-java-protocol-builder.jar"
9+
PROTOCOL_PARSER=cdt-protocol-parser
910

1011
JAVA_CLIENT_DIR=cdt-java-client
1112
JAVA_CLIENT_PACKAGE=com/github/kklisura/cdt/protocol
@@ -17,7 +18,7 @@ EXAMPLES_DIR=cdt-examples
1718

1819
build-cdt-java-protocol-builder:
1920
# Building cdt-java-protocol-builder project...
20-
$(CP) $(PROTOCOL_JSON_FILE) "./$(JAVA_PROTOCOL_BUILDER_DIR)/src/test/resources/protocol.json"
21+
$(CP) $(PROTOCOL_JSON_FILE) "./$(PROTOCOL_PARSER)/src/test/resources/protocol.json"
2122
$(MVN) --file "$(JAVA_PROTOCOL_BUILDER_DIR)/" clean package
2223

2324
compile-cdt-java-client:

‎cdt-java-protocol-builder/THIRD-PARTY.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Lists of 73 third-party dependencies.
2+
Lists of 74 third-party dependencies.
33
(MIT License) args4j (args4j:args4j:2.33 - http://args4j.kohsuke.org/args4j/)
44
(Public Domain) Backport of JSR 166 (backport-util-concurrent:backport-util-concurrent:3.1 - http://backport-jsr166.sourceforge.net/)
55
(Eclipse Public License v1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.2.3 - http://logback.qos.ch/logback-classic)
@@ -9,6 +9,7 @@ Lists of 73 third-party dependencies.
99
(The Apache Software License, Version 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.9.3 - https://github.com/FasterXML/jackson-core)
1010
(The Apache Software License, Version 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.9.3 - http://github.com/FasterXML/jackson)
1111
(GNU Lesser General Public License) (The Apache Software License, Version 2.0) javaparser-core (com.github.javaparser:javaparser-core:3.5.11 - https://github.com/javaparser/javaparser-core)
12+
(The Apache Software License, Version 2.0) cdt-protocol-parser (com.github.kklisura.cdt:cdt-protocol-parser:1.0-SNAPSHOT - https://github.com/kklisura/chrome-devtools-java-client)
1213
(The Apache Software License, Version 2.0) FindBugs-jsr305 (com.google.code.findbugs:jsr305:1.3.9 - http://findbugs.sourceforge.net/)
1314
(The Apache Software License, Version 2.0) error-prone annotations (com.google.errorprone:error_prone_annotations:2.0.18 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
1415
(GNU General Public License, version 2, with the Classpath Exception) Error Prone shaded javac (com.google.errorprone:javac-shaded:9-dev-r4023-3 - https://github.com/google/error-prone-javac)

‎cdt-java-protocol-builder/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
</properties>
4747

4848
<dependencies>
49+
<dependency>
50+
<groupId>com.github.kklisura.cdt</groupId>
51+
<artifactId>cdt-protocol-parser</artifactId>
52+
<version>1.0-SNAPSHOT</version>
53+
</dependency>
54+
4955
<dependency>
5056
<groupId>com.google.googlejavaformat</groupId>
5157
<artifactId>google-java-format</artifactId>
@@ -179,7 +185,7 @@
179185
<root>src/test</root>
180186
</roots>
181187
<licenseMerges>
182-
<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache Public License 2.0|Apache 2|Apache 2.0|Apache License 2.0|Apache License|apache_v2</licenseMerge>
188+
<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache Public License 2.0|Apache 2|Apache 2.0|Apache License 2.0|Apache License|apache_v2|The Apache License, Version 2.0</licenseMerge>
183189
<licenseMerge>Eclipse Public License v1.0|Eclipse Public License 1.0|Eclipse Public License - v 1.0</licenseMerge>
184190
<licenseMerge>BSD 3-Clause License|BSD|New BSD License</licenseMerge>
185191
<licenseMerge>Dual license consisting of the CDDL v1.1 and GPL v2|CDDL+GPL</licenseMerge>

‎cdt-java-protocol-builder/src/license/THIRD-PARTY.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
# Please fill the missing licenses for dependencies :
1616
#
1717
#
18-
#Fri Feb 02 21:29:55 CET 2018
18+
#Tue Feb 06 00:25:40 CET 2018
1919
classworlds--classworlds--1.1-alpha-2=apache_v2
20+
com.github.kklisura.cdt--cdt-protocol-parser--1.0-SNAPSHOT=apache_v2
2021
commons-beanutils--commons-beanutils--1.7.0=apache_v2
2122
commons-codec--commons-codec--1.2=apache_v2
2223
commons-digester--commons-digester--1.6=apache_v2

‎cdt-java-protocol-builder/src/main/java/com/github/kklisura/cdt/definition/builder/Application.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* #L%
2121
*/
2222

23-
import com.github.kklisura.cdt.definition.builder.protocol.DevToolsProtocol;
24-
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
2523
import com.github.kklisura.cdt.definition.builder.support.java.builder.Builder;
2624
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaBuilderFactory;
2725
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaClassBuilder;
@@ -37,7 +35,9 @@
3735
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.TypesBuilder;
3836
import com.github.kklisura.cdt.definition.builder.support.utils.DomainUtils;
3937
import com.github.kklisura.cdt.definition.builder.support.utils.StringUtils;
40-
import com.github.kklisura.cdt.definition.builder.utils.DevToolsProtocolUtils;
38+
import com.github.kklisura.cdt.protocol.definition.DevToolsProtocol;
39+
import com.github.kklisura.cdt.protocol.definition.types.Domain;
40+
import com.github.kklisura.cdt.protocol.definition.utils.DevToolsProtocolUtils;
4141
import java.io.FileInputStream;
4242
import java.io.IOException;
4343
import java.io.InputStream;

‎cdt-java-protocol-builder/src/main/java/com/github/kklisura/cdt/definition/builder/support/protocol/builder/CommandBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
import static com.github.kklisura.cdt.definition.builder.support.utils.StringUtils.getReturnTypeFromGetter;
2525
import static com.github.kklisura.cdt.definition.builder.support.utils.StringUtils.toEnumClass;
2626

27-
import com.github.kklisura.cdt.definition.builder.protocol.types.Command;
28-
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
29-
import com.github.kklisura.cdt.definition.builder.protocol.types.Event;
30-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.ObjectType;
31-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.Property;
3227
import com.github.kklisura.cdt.definition.builder.support.java.builder.Builder;
3328
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaBuilderFactory;
3429
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaInterfaceBuilder;
@@ -37,6 +32,11 @@
3732
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.DomainTypeResolver;
3833
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.PropertyHandlerResult;
3934
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.TypeBuildRequest;
35+
import com.github.kklisura.cdt.protocol.definition.types.Command;
36+
import com.github.kklisura.cdt.protocol.definition.types.Domain;
37+
import com.github.kklisura.cdt.protocol.definition.types.Event;
38+
import com.github.kklisura.cdt.protocol.definition.types.type.object.ObjectType;
39+
import com.github.kklisura.cdt.protocol.definition.types.type.object.Property;
4040
import java.util.ArrayList;
4141
import java.util.Collections;
4242
import java.util.LinkedList;

‎cdt-java-protocol-builder/src/main/java/com/github/kklisura/cdt/definition/builder/support/protocol/builder/EventBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
* #L%
2121
*/
2222

23-
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
24-
import com.github.kklisura.cdt.definition.builder.protocol.types.Event;
25-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.ObjectType;
2623
import com.github.kklisura.cdt.definition.builder.support.java.builder.Builder;
2724
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaBuilderFactory;
2825
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaImportAwareBuilder;
2926
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.DomainTypeResolver;
3027
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.TypeBuildRequest;
28+
import com.github.kklisura.cdt.protocol.definition.types.Domain;
29+
import com.github.kklisura.cdt.protocol.definition.types.Event;
30+
import com.github.kklisura.cdt.protocol.definition.types.type.object.ObjectType;
3131
import java.util.ArrayList;
3232
import java.util.List;
3333
import java.util.Objects;

‎cdt-java-protocol-builder/src/main/java/com/github/kklisura/cdt/definition/builder/support/protocol/builder/TypesBuilder.java‎

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,6 @@
2424
import static com.github.kklisura.cdt.definition.builder.support.utils.StringUtils.toEnumClass;
2525
import static com.github.kklisura.cdt.definition.builder.support.utils.StringUtils.toEnumConstant;
2626

27-
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
28-
import com.github.kklisura.cdt.definition.builder.protocol.types.Type;
29-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.ArrayType;
30-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.EnumType;
31-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.IntegerType;
32-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.NumberType;
33-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.StringType;
34-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.ObjectType;
35-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.Property;
36-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.AnyProperty;
37-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.ArrayProperty;
38-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.BooleanProperty;
39-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.EnumProperty;
40-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.IntegerProperty;
41-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.NumberProperty;
42-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.ObjectProperty;
43-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.RefProperty;
44-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.StringProperty;
45-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.ArrayItem;
46-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.AnyArrayItem;
47-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.EnumArrayItem;
48-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.IntegerArrayItem;
49-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.NumberArrayItem;
50-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.ObjectArrayItem;
51-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.RefArrayItem;
52-
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.items.StringArrayItem;
5327
import com.github.kklisura.cdt.definition.builder.support.java.builder.Builder;
5428
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaBuilderFactory;
5529
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaClassBuilder;
@@ -59,6 +33,32 @@
5933
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.DomainTypeResolver;
6034
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.PropertyHandlerResult;
6135
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.support.TypeBuildRequest;
36+
import com.github.kklisura.cdt.protocol.definition.types.Domain;
37+
import com.github.kklisura.cdt.protocol.definition.types.Type;
38+
import com.github.kklisura.cdt.protocol.definition.types.type.ArrayType;
39+
import com.github.kklisura.cdt.protocol.definition.types.type.EnumType;
40+
import com.github.kklisura.cdt.protocol.definition.types.type.IntegerType;
41+
import com.github.kklisura.cdt.protocol.definition.types.type.NumberType;
42+
import com.github.kklisura.cdt.protocol.definition.types.type.StringType;
43+
import com.github.kklisura.cdt.protocol.definition.types.type.object.ObjectType;
44+
import com.github.kklisura.cdt.protocol.definition.types.type.object.Property;
45+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.AnyProperty;
46+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.ArrayProperty;
47+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.BooleanProperty;
48+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.EnumProperty;
49+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.IntegerProperty;
50+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.NumberProperty;
51+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.ObjectProperty;
52+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.RefProperty;
53+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.StringProperty;
54+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.ArrayItem;
55+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.AnyArrayItem;
56+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.EnumArrayItem;
57+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.IntegerArrayItem;
58+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.NumberArrayItem;
59+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.ObjectArrayItem;
60+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.RefArrayItem;
61+
import com.github.kklisura.cdt.protocol.definition.types.type.object.properties.array.items.StringArrayItem;
6262
import java.util.ArrayList;
6363
import java.util.HashMap;
6464
import java.util.List;
@@ -146,16 +146,13 @@ public class TypesBuilder {
146146
// Registers array item types to java types.
147147
static {
148148
registerTypeArrayItem(
149-
com.github.kklisura.cdt.definition.builder.protocol.types.type.array.items.StringArrayItem
150-
.class,
149+
com.github.kklisura.cdt.protocol.definition.types.type.array.items.StringArrayItem.class,
151150
"String");
152151
registerTypeArrayItem(
153-
com.github.kklisura.cdt.definition.builder.protocol.types.type.array.items.NumberArrayItem
154-
.class,
152+
com.github.kklisura.cdt.protocol.definition.types.type.array.items.NumberArrayItem.class,
155153
"Double");
156154
registerTypeArrayItem(
157-
com.github.kklisura.cdt.definition.builder.protocol.types.type.array.items.IntegerArrayItem
158-
.class,
155+
com.github.kklisura.cdt.protocol.definition.types.type.array.items.IntegerArrayItem.class,
159156
"Integer");
160157
}
161158

@@ -560,7 +557,7 @@ private static String getArrayItemJavaType(ArrayItem arrayItem) {
560557
}
561558

562559
protected static String getArrayItemJavaType(
563-
com.github.kklisura.cdt.definition.builder.protocol.types.type.array.ArrayItem arrayItem) {
560+
com.github.kklisura.cdt.protocol.definition.types.type.array.ArrayItem arrayItem) {
564561
return ARRAY_TYPE_ITEM_TYPE_TO_JAVA_TYPE_MAP.get(arrayItem.getClass());
565562
}
566563

@@ -590,8 +587,7 @@ private static <T extends ArrayItem> void registerArrayItem(Class<T> clazz, Stri
590587
* @param javaType Java type.
591588
* @param <T> Array item class type.
592589
*/
593-
private static <
594-
T extends com.github.kklisura.cdt.definition.builder.protocol.types.type.array.ArrayItem>
590+
private static <T extends com.github.kklisura.cdt.protocol.definition.types.type.array.ArrayItem>
595591
void registerTypeArrayItem(Class<T> clazz, String javaType) {
596592
ARRAY_TYPE_ITEM_TYPE_TO_JAVA_TYPE_MAP.put(clazz, javaType);
597593
}

‎cdt-java-protocol-builder/src/main/java/com/github/kklisura/cdt/definition/builder/support/protocol/builder/support/DomainTypeResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* #L%
2121
*/
2222

23-
import com.github.kklisura.cdt.definition.builder.protocol.types.Type;
23+
import com.github.kklisura.cdt.protocol.definition.types.Type;
2424

2525
/** Domain type resolves type given a domain and its object. */
2626
@FunctionalInterface

‎cdt-java-protocol-builder/src/main/java/com/github/kklisura/cdt/definition/builder/support/protocol/builder/support/TypeBuildRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
* #L%
2121
*/
2222

23-
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
24-
import com.github.kklisura.cdt.definition.builder.protocol.types.Type;
23+
import com.github.kklisura.cdt.protocol.definition.types.Domain;
24+
import com.github.kklisura.cdt.protocol.definition.types.Type;
2525
import lombok.AllArgsConstructor;
2626
import lombok.Getter;
2727
import lombok.Setter;

0 commit comments

Comments
 (0)