Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add asterisk 19 and 20 as a supported versions #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2022
Merged

Add asterisk 19 and 20 as a supported versions #441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 50 additions & 47 deletions src/main/java/org/asteriskjava/AsteriskVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
* @version $Id$
* @since 0.2
*/
public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializable
{
private static final String VERSION_PATTERN_18 = "^\\s*Asterisk (GIT-)?18[-. ].*";
private static final String VERSION_PATTERN_17 = "^\\s*Asterisk (GIT-)?17[-. ].*";
public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializable {
private static final String VERSION_PATTERN_20 = "^\\s*Asterisk (GIT-)?20[-. ].*";
private static final String VERSION_PATTERN_19 = "^\\s*Asterisk (GIT-)?19[-. ].*";
private static final String VERSION_PATTERN_18 = "^\\s*Asterisk (GIT-)?18[-. ].*";
private static final String VERSION_PATTERN_17 = "^\\s*Asterisk (GIT-)?17[-. ].*";
private static final String VERSION_PATTERN_16 = "^\\s*Asterisk (GIT-)?16[-. ].*";
private static final String VERSION_PATTERN_15 = "^\\s*Asterisk (GIT-)?15[-. ].*";
private static final String VERSION_PATTERN_14 = "^\\s*Asterisk (GIT-)?14[-. ].*";
Expand Down Expand Up @@ -121,25 +122,40 @@ public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializabl
*
* @since 2.1.0
*/
public static final AsteriskVersion ASTERISK_16 = new AsteriskVersion(1600, "Asterisk 16", VERSION_PATTERN_16,
VERSION_PATTERN_CERTIFIED_16);
public static final AsteriskVersion ASTERISK_16 = new AsteriskVersion(1600, "Asterisk 16", VERSION_PATTERN_16, VERSION_PATTERN_CERTIFIED_16);

/**
* Represents the Asterisk 17 series.
*
* @since 3.7.0
*/
public static final AsteriskVersion ASTERISK_17 = new AsteriskVersion(1700, "Asterisk 17", VERSION_PATTERN_17);
/**
* Represents the Asterisk 17 series.
*
* @since 3.7.0
*/
public static final AsteriskVersion ASTERISK_17 = new AsteriskVersion(1700, "Asterisk 17", VERSION_PATTERN_17);

/**
* Represents the Asterisk 18 series.
*
* @since 3.13.0
*/
public static final AsteriskVersion ASTERISK_18 = new AsteriskVersion(1800, "Asterisk 18", VERSION_PATTERN_18);

/**
* Represents the Asterisk 18 series.
*
* @since 3.13.0
*/
public static final AsteriskVersion ASTERISK_18 = new AsteriskVersion(1800, "Asterisk 18", VERSION_PATTERN_18);
/**
* Represents the Asterisk 19 series.
*
* @since 3.36.2
*/
public static final AsteriskVersion ASTERISK_19 = new AsteriskVersion(1900, "Asterisk 19", VERSION_PATTERN_19);

/**
* Represents the Asterisk 20 series.
*
* @since 3.36.2
*/
public static final AsteriskVersion ASTERISK_20 = new AsteriskVersion(2000, "Asterisk 20", VERSION_PATTERN_20);

private static final AsteriskVersion knownVersions[] = new AsteriskVersion[]{ASTERISK_18, ASTERISK_17, ASTERISK_16, ASTERISK_15, ASTERISK_14,
ASTERISK_13, ASTERISK_12, ASTERISK_11, ASTERISK_10, ASTERISK_1_8, ASTERISK_1_6};
private static final AsteriskVersion knownVersions[] = new AsteriskVersion[]{
ASTERISK_20, ASTERISK_19, ASTERISK_18, ASTERISK_17, ASTERISK_16, ASTERISK_15, ASTERISK_14, ASTERISK_13,
ASTERISK_12, ASTERISK_11, ASTERISK_10, ASTERISK_1_8, ASTERISK_1_6
};

// current debian stable version, as of 09/10/2018
public static final AsteriskVersion DEFAULT_VERSION = ASTERISK_16;
Expand All @@ -149,15 +165,13 @@ public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializabl
*/
private static final long serialVersionUID = 1L;

private AsteriskVersion(int version, String versionString, String... patterns)
{
private AsteriskVersion(int version, String versionString, String... patterns) {
this.version = version;
this.versionString = versionString;

this.patterns = new Pattern[patterns.length];
int i = 0;
for (String pattern : patterns)
{
for (String pattern : patterns) {
this.patterns[i++] = Pattern.compile(pattern);
}
}
Expand All @@ -168,27 +182,22 @@ private AsteriskVersion(int version, String versionString, String... patterns)
*
* @param o the version to compare to
* @return <code>true</code> if this version is equal to or higher than the
* given version, <code>false</code> otherwise.
* given version, <code>false</code> otherwise.
*/
public boolean isAtLeast(AsteriskVersion o)
{
public boolean isAtLeast(AsteriskVersion o) {
return version >= o.version;
}

public int compareTo(AsteriskVersion o)
{
public int compareTo(AsteriskVersion o) {
return Integer.compare(version, o.version);
}

@Override
public boolean equals(Object o)
{
if (this == o)
{
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass())
{
if (o == null || getClass() != o.getClass()) {
return false;
}

Expand All @@ -198,14 +207,12 @@ public boolean equals(Object o)
}

@Override
public int hashCode()
{
public int hashCode() {
return version;
}

@Override
public String toString()
{
public String toString() {
return versionString;
}

Expand All @@ -216,14 +223,10 @@ public String toString()
* @param coreLine
* @return the detected version, or null if unknown
*/
public static AsteriskVersion getDetermineVersionFromString(String coreLine)
{
for (AsteriskVersion version : knownVersions)
{
for (Pattern pattern : version.patterns)
{
if (pattern.matcher(coreLine).matches())
{
public static AsteriskVersion getDetermineVersionFromString(String coreLine) {
for (AsteriskVersion version : knownVersions) {
for (Pattern pattern : version.patterns) {
if (pattern.matcher(coreLine).matches()) {
return version;
}
}
Expand Down