Skip to content

Commit

Permalink
Documentation updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdlaird committed Apr 12, 2023
1 parent ae8883c commit fafbc1d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
4 changes: 1 addition & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [1.7.2](https://github.com/alexdlaird/java-ngrok/compare/1.7.1...1.7.2) - 2023-04-12
### Added
- Support for `basic_auth` parameter in `ngrok` v3.
- Test improvements.

### Fixed
- Documentation improvements.
- Test improvements.

## [1.7.1](https://github.com/alexdlaird/java-ngrok/compare/1.7.0...1.7.1) - 2023-04-11
### Fixed
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/com/github/alexdlaird/ngrok/NgrokClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@
* <p>
* <p>
* <code>java-ngrok</code> is compatible with <code>ngrok</code> v2 and v3, but by default it will install v2. To
* install v3 instead, set the version with {@link JavaNgrokConfig.Builder#withNgrokVersion(NgrokVersion)}.
* install v3 instead, set the version with {@link JavaNgrokConfig.Builder#withNgrokVersion(NgrokVersion)}
* and {@link CreateTunnel.Builder#withNgrokVersion(NgrokVersion)}.
* <p>
* <strong>Note:</strong> <code>ngrok</code> v2's default behavior for <code>http</code> when no additional properties
* are passed is to open <em>two</em> tunnels, one <code>http</code> and one <code>https</code>. This method will
Expand Down Expand Up @@ -158,6 +159,13 @@ private NgrokClient(final Builder builder) {
* Establish a new <code>ngrok</code> tunnel for the tunnel definition, returning an object representing
* the connected tunnel.
* <p>
* If <code>ngrok</code> is not installed at {@link JavaNgrokConfig}'s <code>ngrokPath</code>, calling this method
* will first download and install <code>ngrok</code>.
* <p>
* <code>java-ngrok</code> is compatible with <code>ngrok</code> v2 and v3, but by default it will install v2. To
* install v3 instead, set the version with {@link JavaNgrokConfig.Builder#withNgrokVersion(NgrokVersion)}
* and {@link CreateTunnel.Builder#withNgrokVersion(NgrokVersion)}.
* <p>
* If <code>ngrok</code> is not running, calling this method will first start a process with
* {@link JavaNgrokConfig}.
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.github.alexdlaird.ngrok.installer.NgrokInstaller;
import com.github.alexdlaird.ngrok.installer.NgrokVersion;
import com.github.alexdlaird.ngrok.process.NgrokLog;
import com.github.alexdlaird.ngrok.protocol.CreateTunnel;
import com.github.alexdlaird.ngrok.protocol.Region;

import java.nio.file.Path;
Expand Down Expand Up @@ -53,6 +54,10 @@
* .withJavaNgrokConfig(javaNgrokConfig)
* .build();
* </pre>
* <h2><code>ngrok</code> Version Compatibility</h2>
* <code>java-ngrok</code> is compatible with <code>ngrok</code> v2 and v3, but by default it will install v2. To
* install v3 instead, set the version with {@link JavaNgrokConfig.Builder#withNgrokVersion(NgrokVersion)}
* and {@link CreateTunnel.Builder#withNgrokVersion(NgrokVersion)}.
*/
public class JavaNgrokConfig {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import com.github.alexdlaird.http.HttpClient;
import com.github.alexdlaird.ngrok.NgrokClient;
import com.github.alexdlaird.ngrok.conf.JavaNgrokConfig;
import com.github.alexdlaird.ngrok.installer.NgrokVersion;

import java.util.List;
Expand Down Expand Up @@ -53,6 +54,10 @@
* createTunnel,
* Tunnel.class);
* </pre>
* <h2><code>ngrok</code> Version Compatibility</h2>
* <code>java-ngrok</code> is compatible with <code>ngrok</code> v2 and v3, but by default it will install v2. To
* install v3 instead, set the version with {@link JavaNgrokConfig.Builder#withNgrokVersion(NgrokVersion)}
* and {@link CreateTunnel.Builder#withNgrokVersion(NgrokVersion)}.
*/
public class CreateTunnel {
private transient final NgrokVersion ngrokVersion;
Expand Down

0 comments on commit fafbc1d

Please sign in to comment.