Skip generation of redirect commands

Author: kklisura

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

@@ -79,21 +79,9 @@ public Builder build(Domain domain, DomainTypeResolver domainTypeResolver) {
 		List<Command> commands = domain.getCommands();
 		if (CollectionUtils.isNotEmpty(commands)) {
 			for (Command command : commands) {
-				List<Property> parameters = command.getParameters();
-				if (parameters == null) {
-					parameters = new ArrayList<>();
-				}
-
-				// Generate methods with mandatory params first
-				List<Property> mandatoryParams = filterParameters(parameters, property ->
-						!Boolean.TRUE.equals(property.getOptional()));
-				command.setParameters(mandatoryParams);
-				addCommand(command, domain, interfaceBuilder, domainTypeResolver, builders);
-
-				if (mandatoryParams.size() != parameters.size()) {
-					// Generate methods with rest of the params
-					command.setParameters(parameters);
-					addCommand(command, domain, interfaceBuilder, domainTypeResolver, builders);
+				// Do not generate commands with redirect value. Source https://github.com/ChromeDevTools/debugger-protocol-viewer/issues/26
+				if (StringUtils.isEmpty(command.getRedirect())) {
+					processCommand(command, domain, interfaceBuilder, domainTypeResolver, builders);
 				}
 			}
 		}
@@ -105,6 +93,26 @@ public Builder build(Domain domain, DomainTypeResolver domainTypeResolver) {
 		return new CombinedBuilders(builders);
 	}
 
+	private void processCommand(Command command, Domain domain, JavaInterfaceBuilder interfaceBuilder,
+								DomainTypeResolver domainTypeResolver, List<Builder> builders) {
+		List<Property> parameters = command.getParameters();
+		if (parameters == null) {
+			parameters = new ArrayList<>();
+		}
+
+		// Generate methods with mandatory params first
+		List<Property> mandatoryParams = filterParameters(parameters, property ->
+				!Boolean.TRUE.equals(property.getOptional()));
+		command.setParameters(mandatoryParams);
+		addCommand(command, domain, interfaceBuilder, domainTypeResolver, builders);
+
+		if (mandatoryParams.size() != parameters.size()) {
+			// Generate methods with rest of the params
+			command.setParameters(parameters);
+			addCommand(command, domain, interfaceBuilder, domainTypeResolver, builders);
+		}
+	}
+
 	private void addCommand(Command command, Domain domain, JavaInterfaceBuilder interfaceBuilder,
 							DomainTypeResolver domainTypeResolver, List<Builder> builders) {
 		final String method = command.getName();

cdtp-definition-builder/src/test/java/com/github/kklisura/cdtp/definition/builder/support/protocol/builder/CommandBuilderTest.java

@@ -122,7 +122,12 @@ public void testBuildCommandWithSimpleMethod() {
 		command2.setName("command2");
 		command2.setDescription("command2 description");
 
-		domain.setCommands(Arrays.asList(command1, command2));
+		final Command command3 = new Command();
+		command3.setName("command3");
+		command3.setDescription("command3 description");
+		command3.setRedirect("Redirect");
+
+		domain.setCommands(Arrays.asList(command1, command2, command3));
 
 		expect(javaBuilderFactory.createInterfaceBuilder(BASE_PACKAGE_NAME, "DomainName"))
 				.andReturn(interfaceBuilder);

cdtp-java-client/src/main/java/com/github/kklisura/cdtp/protocol/commands/DOM.java

@@ -162,21 +162,6 @@ public interface DOM {
 	@Returns("nodeId")
 	Integer requestNode(@ParamName("objectId") String objectId);
 
-	/**
-	 * Highlights given rectangle.
-	 */
-	void highlightRect();
-
-	/**
-	 * Highlights DOM node.
-	 */
-	void highlightNode();
-
-	/**
-	 * Hides any highlight.
-	 */
-	void hideHighlight();
-
 	/**
 	 * Requests that the node is sent to the caller given its path. // FIXME, use XPath
 	 */

cdtp-java-client/src/main/java/com/github/kklisura/cdtp/protocol/commands/Page.java

@@ -5,11 +5,8 @@
 import com.github.kklisura.cdtp.protocol.annotations.ParamName;
 import com.github.kklisura.cdtp.protocol.annotations.Returns;
 import com.github.kklisura.cdtp.protocol.types.debugger.SearchMatch;
-import com.github.kklisura.cdtp.protocol.types.emulation.ScreenOrientation;
-import com.github.kklisura.cdtp.protocol.types.network.Cookie;
 import com.github.kklisura.cdtp.protocol.types.page.AppManifest;
 import com.github.kklisura.cdtp.protocol.types.page.Behavior;
-import com.github.kklisura.cdtp.protocol.types.page.Configuration;
 import com.github.kklisura.cdtp.protocol.types.page.Format;
 import com.github.kklisura.cdtp.protocol.types.page.FrameResourceTree;
 import com.github.kklisura.cdtp.protocol.types.page.LayoutMetrics;
@@ -114,19 +111,6 @@ public interface Page {
 	@Experimental
 	void navigateToHistoryEntry(@ParamName("entryId") Integer entryId);
 
-	/**
-	 * Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field.
-	 */
-	@Experimental
-	@Returns("cookies")
-	List<Cookie> getCookies();
-
-	/**
-	 * Deletes browser cookie with given name, domain and path.
-	 */
-	@Experimental
-	void deleteCookie(@ParamName("cookieName") String cookieName, @ParamName("url") String url);
-
 	/**
 	 * Returns present frame / resource tree structure.
 	 */
@@ -160,63 +144,6 @@ public interface Page {
 	@Experimental
 	void setDocumentContent(@ParamName("frameId") String frameId, @ParamName("html") String html);
 
-	/**
-	 * Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and "device-width"/"device-height"-related CSS media query results).
-	 */
-	@Experimental
-	void setDeviceMetricsOverride(@ParamName("width") Integer width, @ParamName("height") Integer height, @ParamName("deviceScaleFactor") Double deviceScaleFactor, @ParamName("mobile") Boolean mobile);
-
-	/**
-	 * Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and "device-width"/"device-height"-related CSS media query results).
-	 */
-	@Experimental
-	void setDeviceMetricsOverride(@ParamName("width") Integer width, @ParamName("height") Integer height, @ParamName("deviceScaleFactor") Double deviceScaleFactor, @ParamName("mobile") Boolean mobile, @Optional @ParamName("scale") Double scale, @Optional @ParamName("screenWidth") Integer screenWidth, @Optional @ParamName("screenHeight") Integer screenHeight, @Optional @ParamName("positionX") Integer positionX, @Optional @ParamName("positionY") Integer positionY, @Optional @ParamName("dontSetVisibleSize") Boolean dontSetVisibleSize, @Optional @ParamName("screenOrientation") ScreenOrientation screenOrientation);
-
-	/**
-	 * Clears the overriden device metrics.
-	 */
-	@Experimental
-	void clearDeviceMetricsOverride();
-
-	/**
-	 * Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position unavailable.
-	 */
-	void setGeolocationOverride();
-
-	/**
-	 * Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position unavailable.
-	 */
-	void setGeolocationOverride(@Optional @ParamName("latitude") Double latitude, @Optional @ParamName("longitude") Double longitude, @Optional @ParamName("accuracy") Double accuracy);
-
-	/**
-	 * Clears the overriden Geolocation Position and Error.
-	 */
-	void clearGeolocationOverride();
-
-	/**
-	 * Overrides the Device Orientation.
-	 */
-	@Experimental
-	void setDeviceOrientationOverride(@ParamName("alpha") Double alpha, @ParamName("beta") Double beta, @ParamName("gamma") Double gamma);
-
-	/**
-	 * Clears the overridden Device Orientation.
-	 */
-	@Experimental
-	void clearDeviceOrientationOverride();
-
-	/**
-	 * Toggles mouse event-based touch event emulation.
-	 */
-	@Experimental
-	void setTouchEmulationEnabled(@ParamName("enabled") Boolean enabled);
-
-	/**
-	 * Toggles mouse event-based touch event emulation.
-	 */
-	@Experimental
-	void setTouchEmulationEnabled(@ParamName("enabled") Boolean enabled, @Optional @ParamName("configuration") Configuration configuration);
-
 	/**
 	 * Capture page screenshot.
 	 */