Skip to content

Commit 301ea41

Browse files
kklisurakklisura
committed
Rename packages; projects
1 parent 9035b0e commit 301ea41

File tree

522 files changed

+2357
-2301
lines changed

Some content is hidden

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

522 files changed

+2357
-2301
lines changed

‎Makefile‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ JAVA=java
44
CP=cp
55
RUN_JAR=$(JAVA) -jar
66

7-
DEFINITION_BUILDER_DIR=cdtp-definition-builder
8-
DEFINITION_BUILDER_JAR="$(DEFINITION_BUILDER_DIR)/target/cdtp-definition-builder.jar"
7+
DEFINITION_BUILDER_DIR=cdt-definition-builder
8+
DEFINITION_BUILDER_JAR="$(DEFINITION_BUILDER_DIR)/target/cdt-definition-builder.jar"
99

10-
JAVA_CLIENT_DIR=cdtp-java-client
11-
JAVA_CLIENT_PACKAGE=com/github/kklisura/cdtp/protocol
10+
JAVA_CLIENT_DIR=cdt-java-client
11+
JAVA_CLIENT_PACKAGE=com/github/kklisura/cdt/protocol
1212

13-
PACKAGE_NAME=com.github.kklisura.cdtp.protocol
13+
PACKAGE_NAME=com.github.kklisura.cdt.protocol
1414
PROTOCOL_JSON_FILE=./protocol.json
1515

16-
build-cdtp-definition-builder:
17-
# Building cdtp-definition-builder project...
16+
build-cdt-definition-builder:
17+
# Building cdt-definition-builder project...
1818
$(CP) $(PROTOCOL_JSON_FILE) "./$(DEFINITION_BUILDER_DIR)/src/test/resources/protocol.json"
1919
$(MVN) --file "$(DEFINITION_BUILDER_DIR)/" clean package
2020

21-
compile-cdtp-java-client:
22-
# Compiling cdtp-java-client project...
21+
compile-cdt-java-client:
22+
# Compiling cdt-java-client project...
2323
$(MVN) --file "$(JAVA_CLIENT_DIR)/" clean compile
2424

25-
clean-cdtp-definition-builder:
26-
# Cleaning cdtp-definition-builder project...
25+
clean-cdt-definition-builder:
26+
# Cleaning cdt-definition-builder project...
2727
$(MVN) --file "$(DEFINITION_BUILDER_DIR)/" clean
2828

29-
clean-cdtp-java-client:
30-
# Cleaning cdtp-java-client project...
29+
clean-cdt-java-client:
30+
# Cleaning cdt-java-client project...
3131
$(MVN) --file "$(JAVA_CLIENT_DIR)/" clean
3232

3333
clean-previous-protocol-definition:
@@ -36,13 +36,13 @@ clean-previous-protocol-definition:
3636
$(RM) -rf $(JAVA_CLIENT_DIR)/src/main/java/$(JAVA_CLIENT_PACKAGE)/events
3737
$(RM) -rf $(JAVA_CLIENT_DIR)/src/main/java/$(JAVA_CLIENT_PACKAGE)/commands
3838

39-
upgrade-protocol-definition: build-cdtp-definition-builder clean-previous-protocol-definition
39+
upgrade-protocol-definition: build-cdt-definition-builder clean-previous-protocol-definition
4040
$(RUN_JAR) $(DEFINITION_BUILDER_JAR) --base-package="$(PACKAGE_NAME)" \
4141
--output=./$(JAVA_CLIENT_DIR)/ \
4242
--protocol=$(PROTOCOL_JSON_FILE)
4343

44-
update-protocol-definition: upgrade-protocol-definition compile-cdtp-java-client
45-
# Updated protocol definition on cdtp-java-client
44+
update-protocol-definition: upgrade-protocol-definition compile-cdt-java-client
45+
# Updated protocol definition on cdt-java-client
4646

4747
sonar-analysis:
4848
# Running sonar analysis

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ make update-protocol-definition
1616

1717
By running, this will:
1818

19-
- Build `cdtp-definition-builder` project.
19+
- Build `cdt-definition-builder` project.
2020

21-
- Clean previous protocol definition (remove packages `commands`, `events`, `types` from `cdtp-java-client` project).
21+
- Clean previous protocol definition (remove packages `commands`, `events`, `types` from `cdt-java-client` project).
2222

23-
- Run `cdtp-definition-builder` and parse `protocol.json` file. Output classess will be written to `cdtp-java-client` project in `src/main/java/com/github/kklisura/cdtp/protocol` directory.
23+
- Run `cdt-definition-builder` and parse `protocol.json` file. Output classess will be written to `cdt-java-client` project in `src/main/java/com/github/kklisura/cdt/protocol` directory.
2424

25-
- Compile `cdtp-java-client` in order to check if project compiles successfully.
25+
- Compile `cdt-java-client` in order to check if project compiles successfully.
2626

2727
## License
2828

cdtp-definition-builder/Makefile renamed to cdt-definition-builder/Makefile

File renamed without changes.

cdtp-definition-builder/pom.xml renamed to cdt-definition-builder/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>com.github.kklisura.cdtp</groupId>
6-
<artifactId>cdtp-definition-builder</artifactId>
5+
<groupId>com.github.kklisura.cdt</groupId>
6+
<artifactId>cdt-definition-builder</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<name>chrome-dev-tools-protocol-definition-builder</name>
11-
<url>https://github.com/kklisura/cdtp-java-client</url>
11+
<url>https://github.com/kklisura/chrome-devtools-java-client</url>
1212

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -160,7 +160,7 @@
160160
<manifest>
161161
<addClasspath>true</addClasspath>
162162
<classpathPrefix>lib/</classpathPrefix>
163-
<mainClass>com.github.kklisura.cdtp.definition.builder.Application</mainClass>
163+
<mainClass>com.github.kklisura.cdt.definition.builder.Application</mainClass>
164164
</manifest>
165165
</archive>
166166
</configuration>

cdtp-definition-builder/src/main/java/com/github/kklisura/cdtp/definition/builder/Application.java renamed to cdt-definition-builder/src/main/java/com/github/kklisura/cdt/definition/builder/Application.java

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
package com.github.kklisura.cdtp.definition.builder;
2-
3-
import static com.github.kklisura.cdtp.definition.builder.support.utils.DomainUtils.devToolsProtocolResolver;
4-
import static com.github.kklisura.cdtp.definition.builder.support.utils.StringUtils.buildPackageName;
1+
package com.github.kklisura.cdt.definition.builder;
52

63
import com.github.javaparser.ast.CompilationUnit;
74
import com.github.javaparser.printer.PrettyPrinter;
85
import com.github.javaparser.printer.PrettyPrinterConfiguration;
96
import com.github.javaparser.utils.SourceRoot;
10-
import com.github.kklisura.cdtp.definition.builder.protocol.DevToolsProtocol;
11-
import com.github.kklisura.cdtp.definition.builder.protocol.types.Domain;
12-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.Builder;
13-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.JavaBuilderFactory;
14-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.JavaClassBuilder;
15-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.JavaEnumBuilder;
16-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.JavaInterfaceBuilder;
17-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.impl.JavaClassBuilderImpl;
18-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.impl.JavaEnumBuilderImpl;
19-
import com.github.kklisura.cdtp.definition.builder.support.java.builder.impl.JavaInterfaceBuilderImpl;
20-
import com.github.kklisura.cdtp.definition.builder.support.protocol.builder.CommandBuilder;
21-
import com.github.kklisura.cdtp.definition.builder.support.protocol.builder.EventBuilder;
22-
import com.github.kklisura.cdtp.definition.builder.support.protocol.builder.TypesBuilder;
23-
import com.github.kklisura.cdtp.definition.builder.utils.DevToolsProtocolUtils;
7+
import com.github.kklisura.cdt.definition.builder.protocol.DevToolsProtocol;
8+
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
9+
import com.github.kklisura.cdt.definition.builder.support.java.builder.Builder;
10+
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaBuilderFactory;
11+
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaClassBuilder;
12+
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaEnumBuilder;
13+
import com.github.kklisura.cdt.definition.builder.support.java.builder.JavaInterfaceBuilder;
14+
import com.github.kklisura.cdt.definition.builder.support.java.builder.impl.JavaClassBuilderImpl;
15+
import com.github.kklisura.cdt.definition.builder.support.java.builder.impl.JavaEnumBuilderImpl;
16+
import com.github.kklisura.cdt.definition.builder.support.java.builder.impl.JavaInterfaceBuilderImpl;
17+
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.CommandBuilder;
18+
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.EventBuilder;
19+
import com.github.kklisura.cdt.definition.builder.support.protocol.builder.TypesBuilder;
20+
import com.github.kklisura.cdt.definition.builder.support.utils.DomainUtils;
21+
import com.github.kklisura.cdt.definition.builder.support.utils.StringUtils;
22+
import com.github.kklisura.cdt.definition.builder.utils.DevToolsProtocolUtils;
2423
import com.google.googlejavaformat.java.Formatter;
2524
import com.google.googlejavaformat.java.FormatterException;
2625
import com.google.googlejavaformat.java.JavaFormatterOptions;
@@ -70,16 +69,17 @@ public static void main(String[] args) throws IOException {
7069
System.exit(1);
7170
}
7271

73-
final String typesPackageName = buildPackageName(configuration.getBasePackage(), TYPES_PACKAGE);
72+
final String typesPackageName =
73+
StringUtils.buildPackageName(configuration.getBasePackage(), TYPES_PACKAGE);
7474
final String eventPackageName =
75-
buildPackageName(configuration.getBasePackage(), EVENTS_PACKAGE);
75+
StringUtils.buildPackageName(configuration.getBasePackage(), EVENTS_PACKAGE);
7676
final String commandPackageName =
77-
buildPackageName(configuration.getBasePackage(), COMMANDS_PACKAGE);
77+
StringUtils.buildPackageName(configuration.getBasePackage(), COMMANDS_PACKAGE);
7878

7979
final String supportTypesPackageName =
80-
buildPackageName(configuration.getBasePackage(), SUPPORT_TYPE_PACKAGE);
80+
StringUtils.buildPackageName(configuration.getBasePackage(), SUPPORT_TYPE_PACKAGE);
8181
final String supportAnnotationsPackageName =
82-
buildPackageName(configuration.getBasePackage(), SUPPORT_ANNOTATIONS_PACKAGE);
82+
StringUtils.buildPackageName(configuration.getBasePackage(), SUPPORT_ANNOTATIONS_PACKAGE);
8383

8484
final InputStream inputStream = new FileInputStream(configuration.getProtocolFile());
8585
final DevToolsProtocol protocol = DevToolsProtocolUtils.readJson(inputStream);
@@ -122,9 +122,11 @@ public JavaInterfaceBuilder createInterfaceBuilder(
122122

123123
// Create domain type builders
124124
for (Domain domain : protocol.getDomains()) {
125-
builderList.addAll(typesBuilder.build(domain, devToolsProtocolResolver(protocol)));
126-
builderList.addAll(eventBuilder.build(domain, devToolsProtocolResolver(protocol)));
127-
builderList.add(commandBuilder.build(domain, devToolsProtocolResolver(protocol)));
125+
builderList.addAll(
126+
typesBuilder.build(domain, DomainUtils.devToolsProtocolResolver(protocol)));
127+
builderList.addAll(
128+
eventBuilder.build(domain, DomainUtils.devToolsProtocolResolver(protocol)));
129+
builderList.add(commandBuilder.build(domain, DomainUtils.devToolsProtocolResolver(protocol)));
128130
}
129131

130132
// Build command factory

cdtp-definition-builder/src/main/java/com/github/kklisura/cdtp/definition/builder/Configuration.java renamed to cdt-definition-builder/src/main/java/com/github/kklisura/cdt/definition/builder/Configuration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.kklisura.cdtp.definition.builder;
1+
package com.github.kklisura.cdt.definition.builder;
22

33
import java.io.File;
44
import lombok.Getter;
@@ -15,7 +15,7 @@
1515
public class Configuration {
1616
@Option(
1717
name = "--base-package",
18-
usage = "Base package name (com.github.kklisura.cdtp.protocol)",
18+
usage = "Base package name (com.github.kklisura.cdt.protocol)",
1919
metaVar = "PACKAGE",
2020
required = true
2121
)

cdtp-definition-builder/src/main/java/com/github/kklisura/cdtp/definition/builder/protocol/DevToolsProtocol.java renamed to cdt-definition-builder/src/main/java/com/github/kklisura/cdt/definition/builder/protocol/DevToolsProtocol.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.github.kklisura.cdtp.definition.builder.protocol;
1+
package com.github.kklisura.cdt.definition.builder.protocol;
22

3-
import com.github.kklisura.cdtp.definition.builder.protocol.types.Domain;
4-
import com.github.kklisura.cdtp.definition.builder.protocol.types.Version;
3+
import com.github.kklisura.cdt.definition.builder.protocol.types.Domain;
4+
import com.github.kklisura.cdt.definition.builder.protocol.types.Version;
55
import java.util.List;
66
import lombok.Getter;
77
import lombok.Setter;

cdtp-definition-builder/src/main/java/com/github/kklisura/cdtp/definition/builder/protocol/deserializers/BaseSubTypeJsonDeserializer.java renamed to cdt-definition-builder/src/main/java/com/github/kklisura/cdt/definition/builder/protocol/deserializers/BaseSubTypeJsonDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.kklisura.cdtp.definition.builder.protocol.deserializers;
1+
package com.github.kklisura.cdt.definition.builder.protocol.deserializers;
22

33
import com.fasterxml.jackson.core.JsonParseException;
44
import com.fasterxml.jackson.core.JsonParser;

‎cdt-definition-builder/src/main/java/com/github/kklisura/cdt/definition/builder/protocol/deserializers/impl/properties/PropertyArrayItemSubTypeJsonDeserializer.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.github.kklisura.cdt.definition.builder.protocol.deserializers.impl.properties;
2+
3+
import com.github.kklisura.cdt.definition.builder.protocol.deserializers.BaseSubTypeJsonDeserializer;
4+
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.properties.array.ArrayItem;
5+
6+
/**
7+
* Property array item json deserializer.
8+
*
9+
* @author Kenan Klisura
10+
*/
11+
public class PropertyArrayItemSubTypeJsonDeserializer
12+
extends BaseSubTypeJsonDeserializer<ArrayItem> {
13+
public PropertyArrayItemSubTypeJsonDeserializer() {
14+
super(ArrayItem.class);
15+
}
16+
}

‎cdt-definition-builder/src/main/java/com/github/kklisura/cdt/definition/builder/protocol/deserializers/impl/properties/PropertySubTypeJsonDeserializer.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.github.kklisura.cdt.definition.builder.protocol.deserializers.impl.properties;
2+
3+
import com.github.kklisura.cdt.definition.builder.protocol.deserializers.BaseSubTypeJsonDeserializer;
4+
import com.github.kklisura.cdt.definition.builder.protocol.types.type.object.Property;
5+
6+
/**
7+
* Property json deserializer.
8+
*
9+
* @author Kenan Klisura
10+
*/
11+
public class PropertySubTypeJsonDeserializer extends BaseSubTypeJsonDeserializer<Property> {
12+
public PropertySubTypeJsonDeserializer() {
13+
super(Property.class);
14+
}
15+
}

0 commit comments

Comments
 (0)