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

Skip to content

Commit 29a0191

Browse files
piotrooopiotrooo
committed
Add asterisk 19 and 20 as a supported versions (#441)
1 parent 3c2788b commit 29a0191

File tree

1 file changed

+50
-47
lines changed

1 file changed

+50
-47
lines changed

‎asterisk-java-all/src/main/java/org/asteriskjava/AsteriskVersion.java‎

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
* @version $Id$
2727
* @since 0.2
2828
*/
29-
public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializable
30-
{
31-
private static final String VERSION_PATTERN_18 = "^\\s*Asterisk (GIT-)?18[-. ].*";
32-
private static final String VERSION_PATTERN_17 = "^\\s*Asterisk (GIT-)?17[-. ].*";
29+
public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializable {
30+
private static final String VERSION_PATTERN_20 = "^\\s*Asterisk (GIT-)?20[-. ].*";
31+
private static final String VERSION_PATTERN_19 = "^\\s*Asterisk (GIT-)?19[-. ].*";
32+
private static final String VERSION_PATTERN_18 = "^\\s*Asterisk (GIT-)?18[-. ].*";
33+
private static final String VERSION_PATTERN_17 = "^\\s*Asterisk (GIT-)?17[-. ].*";
3334
private static final String VERSION_PATTERN_16 = "^\\s*Asterisk (GIT-)?16[-. ].*";
3435
private static final String VERSION_PATTERN_15 = "^\\s*Asterisk (GIT-)?15[-. ].*";
3536
private static final String VERSION_PATTERN_14 = "^\\s*Asterisk (GIT-)?14[-. ].*";
@@ -121,25 +122,40 @@ public class AsteriskVersion implements Comparable<AsteriskVersion>, Serializabl
121122
*
122123
* @since 2.1.0
123124
*/
124-
public static final AsteriskVersion ASTERISK_16 = new AsteriskVersion(1600, "Asterisk 16", VERSION_PATTERN_16,
125-
VERSION_PATTERN_CERTIFIED_16);
125+
public static final AsteriskVersion ASTERISK_16 = new AsteriskVersion(1600, "Asterisk 16", VERSION_PATTERN_16, VERSION_PATTERN_CERTIFIED_16);
126126

127-
/**
128-
* Represents the Asterisk 17 series.
129-
*
130-
* @since 3.7.0
131-
*/
132-
public static final AsteriskVersion ASTERISK_17 = new AsteriskVersion(1700, "Asterisk 17", VERSION_PATTERN_17);
127+
/**
128+
* Represents the Asterisk 17 series.
129+
*
130+
* @since 3.7.0
131+
*/
132+
public static final AsteriskVersion ASTERISK_17 = new AsteriskVersion(1700, "Asterisk 17", VERSION_PATTERN_17);
133+
134+
/**
135+
* Represents the Asterisk 18 series.
136+
*
137+
* @since 3.13.0
138+
*/
139+
public static final AsteriskVersion ASTERISK_18 = new AsteriskVersion(1800, "Asterisk 18", VERSION_PATTERN_18);
133140

134-
/**
135-
* Represents the Asterisk 18 series.
136-
*
137-
* @since 3.13.0
138-
*/
139-
public static final AsteriskVersion ASTERISK_18 = new AsteriskVersion(1800, "Asterisk 18", VERSION_PATTERN_18);
141+
/**
142+
* Represents the Asterisk 19 series.
143+
*
144+
* @since 3.36.2
145+
*/
146+
public static final AsteriskVersion ASTERISK_19 = new AsteriskVersion(1900, "Asterisk 19", VERSION_PATTERN_19);
147+
148+
/**
149+
* Represents the Asterisk 20 series.
150+
*
151+
* @since 3.36.2
152+
*/
153+
public static final AsteriskVersion ASTERISK_20 = new AsteriskVersion(2000, "Asterisk 20", VERSION_PATTERN_20);
140154

141-
private static final AsteriskVersion knownVersions[] = new AsteriskVersion[]{ASTERISK_18, ASTERISK_17, ASTERISK_16, ASTERISK_15, ASTERISK_14,
142-
ASTERISK_13, ASTERISK_12, ASTERISK_11, ASTERISK_10, ASTERISK_1_8, ASTERISK_1_6};
155+
private static final AsteriskVersion knownVersions[] = new AsteriskVersion[]{
156+
ASTERISK_20, ASTERISK_19, ASTERISK_18, ASTERISK_17, ASTERISK_16, ASTERISK_15, ASTERISK_14, ASTERISK_13,
157+
ASTERISK_12, ASTERISK_11, ASTERISK_10, ASTERISK_1_8, ASTERISK_1_6
158+
};
143159

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

152-
private AsteriskVersion(int version, String versionString, String... patterns)
153-
{
168+
private AsteriskVersion(int version, String versionString, String... patterns) {
154169
this.version = version;
155170
this.versionString = versionString;
156171

157172
this.patterns = new Pattern[patterns.length];
158173
int i = 0;
159-
for (String pattern : patterns)
160-
{
174+
for (String pattern : patterns) {
161175
this.patterns[i++] = Pattern.compile(pattern);
162176
}
163177
}
@@ -168,27 +182,22 @@ private AsteriskVersion(int version, String versionString, String... patterns)
168182
*
169183
* @param o the version to compare to
170184
* @return <code>true</code> if this version is equal to or higher than the
171-
* given version, <code>false</code> otherwise.
185+
* given version, <code>false</code> otherwise.
172186
*/
173-
public boolean isAtLeast(AsteriskVersion o)
174-
{
187+
public boolean isAtLeast(AsteriskVersion o) {
175188
return version >= o.version;
176189
}
177190

178-
public int compareTo(AsteriskVersion o)
179-
{
191+
public int compareTo(AsteriskVersion o) {
180192
return Integer.compare(version, o.version);
181193
}
182194

183195
@Override
184-
public boolean equals(Object o)
185-
{
186-
if (this == o)
187-
{
196+
public boolean equals(Object o) {
197+
if (this == o) {
188198
return true;
189199
}
190-
if (o == null || getClass() != o.getClass())
191-
{
200+
if (o == null || getClass() != o.getClass()) {
192201
return false;
193202
}
194203

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

200209
@Override
201-
public int hashCode()
202-
{
210+
public int hashCode() {
203211
return version;
204212
}
205213

206214
@Override
207-
public String toString()
208-
{
215+
public String toString() {
209216
return versionString;
210217
}
211218

@@ -216,14 +223,10 @@ public String toString()
216223
* @param coreLine
217224
* @return the detected version, or null if unknown
218225
*/
219-
public static AsteriskVersion getDetermineVersionFromString(String coreLine)
220-
{
221-
for (AsteriskVersion version : knownVersions)
222-
{
223-
for (Pattern pattern : version.patterns)
224-
{
225-
if (pattern.matcher(coreLine).matches())
226-
{
226+
public static AsteriskVersion getDetermineVersionFromString(String coreLine) {
227+
for (AsteriskVersion version : knownVersions) {
228+
for (Pattern pattern : version.patterns) {
229+
if (pattern.matcher(coreLine).matches()) {
227230
return version;
228231
}
229232
}

0 commit comments

Comments
 (0)