Merge pull request #429 from mivek/bugfix/ParseWeatherCondition

Bugfix parse weather condition

.github/workflows/sonar-master.yml

@@ -8,7 +8,7 @@ jobs:
     name: Build and analyze
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up JDK 17

metarParser-entities/src/main/java/io/github/mivek/enums/RunwayInfoTrend.java

@@ -35,6 +35,11 @@ public String toString() {
     return Messages.getInstance().getString("Converter." + key);
   }
 
+  /**
+   * Returns a trend given a token.
+   * @param input String representing a trend.
+   * @return The RunwayInfoTrend object.
+   */
   public static RunwayInfoTrend get(final String input) {
     return Arrays.stream(RunwayInfoTrend.values())
         .filter(trend -> trend.shortcut.equals(input))

metarParser-parsers/src/main/java/io/github/mivek/command/remark/HourlyMaximumMinimumTemperatureCommand.java

@@ -16,6 +16,9 @@ public final class HourlyMaximumMinimumTemperatureCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     HourlyMaximumMinimumTemperatureCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/HourlyPressureCommand.java

@@ -29,6 +29,9 @@ public final class HourlyPressureCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     HourlyPressureCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/HourlyTemperatureDewPointCommand.java

@@ -15,6 +15,9 @@ public final class HourlyTemperatureDewPointCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     HourlyTemperatureDewPointCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/IceAccretionCommand.java

@@ -14,6 +14,9 @@ public final class IceAccretionCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     IceAccretionCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/PrecipitationAmount24HourCommand.java

@@ -15,6 +15,9 @@ public final class PrecipitationAmount24HourCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     PrecipitationAmount24HourCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/PrecipitationAmount36HourCommand.java

@@ -15,6 +15,9 @@ public final class PrecipitationAmount36HourCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     PrecipitationAmount36HourCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/SnowDepthCommand.java

@@ -14,6 +14,9 @@ public final class SnowDepthCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     SnowDepthCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/SunshineDurationCommand.java

@@ -14,6 +14,9 @@ public final class SunshineDurationCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     SunshineDurationCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/command/remark/WaterEquivalentSnowCommand.java

@@ -14,6 +14,9 @@ public final class WaterEquivalentSnowCommand implements Command {
     /** The message instance. */
     private final Messages messages;
 
+    /**
+     * Constructor.
+     */
     WaterEquivalentSnowCommand() {
         this.messages = Messages.getInstance();
     }

metarParser-parsers/src/main/java/io/github/mivek/parser/AbstractWeatherContainerParser.java

@@ -54,24 +54,34 @@ public abstract class AbstractWeatherContainerParser<T extends AbstractWeatherCo
    */
   WeatherCondition parseWeatherCondition(final String weatherPart) {
       WeatherCondition wc = new WeatherCondition();
+      String weatherPartCopy = weatherPart;
       String match;
       if (Regex.find(INTENSITY_REGEX, weatherPart)) {
           match = Regex.findString(INTENSITY_REGEX, weatherPart);
           Intensity i = Intensity.getEnum(match);
           wc.setIntensity(i);
+          weatherPartCopy = weatherPartCopy.substring(i.getShortcut().length());
       }
       for (Descriptive des : Descriptive.values()) {
           if (Regex.findString(Pattern.compile("(" + des.getShortcut() + ")"), weatherPart) != null) {
               wc.setDescriptive(des);
+              weatherPartCopy = weatherPartCopy.substring(des.getShortcut().length());
               break;
           }
       }
-      for (Phenomenon phe : Phenomenon.values()) {
-          if (Regex.findString(Pattern.compile("(" + phe.getShortcut() + ")"), weatherPart) != null) {
-              wc.addPhenomenon(phe);
+
+      String previousToken = "";
+      while (!weatherPartCopy.isEmpty() && !weatherPartCopy.equals(previousToken)) {
+          previousToken = weatherPartCopy;
+          for (Phenomenon phenom: Phenomenon.values()) {
+            if (Regex.find(Pattern.compile("^" + phenom.getShortcut()), weatherPartCopy)) {
+              wc.addPhenomenon(phenom);
+              weatherPartCopy = weatherPartCopy.substring(phenom.getShortcut().length());
+            }
           }
       }
-      if (wc.isValid()) {
+
+      if (wc.isValid() && weatherPartCopy.isEmpty()) {
           return wc;
       }
       return null;

metarParser-parsers/src/test/java/io/github/mivek/parser/AbstractWeatherContainerParserTest.java

@@ -66,4 +66,16 @@ void testParseWCDescriptiveIsNotNullButPhenomenonCanBeEmptyAndIntensityCanBeNull
 
     assertNull(wc);
   }
+
+  @Test
+  void testParseWeatherConditionOrder() {
+    WeatherCondition wc = getParser().parseWeatherCondition("-SNRA");
+
+    assertNotNull(wc);
+    assertEquals(Intensity.LIGHT, wc.getIntensity());
+    assertNull(wc.getDescriptive());
+    assertThat(wc.getPhenomenons(), hasSize(2));
+    assertEquals(Phenomenon.SNOW, wc.getPhenomenons().get(0));
+    assertEquals(Phenomenon.RAIN, wc.getPhenomenons().get(1));
+  }
 }

metarParser-parsers/src/test/java/io/github/mivek/parser/TAFParserTest.java

@@ -857,4 +857,17 @@ void testParseWithIcingAndTurbulenceTrends() throws ParseException {
         assertThat(taf.getBECMGs().get(5).getIcings(), hasSize(1));
         assertThat(taf.getBECMGs().get(5).getTurbulences(), hasSize(2));
     }
+
+    @Test
+    void testParseWithAMDS() throws ParseException {
+        String code = """
+            TAF AMD KVOK 232200Z 2322/2423 15015G20KT 9999 BKN035 BKN050 510008 QNH2966INS
+            BECMG 2411/2412 17012KT 9000 -SHRA FEW006 BKN014 OVC021 510065 QNH2965INS TX24/2322Z TN16/2413Z LAST NO AMDS AFT 2322 NEXT 2409""";
+
+        TAF taf = parser.parse(code);
+
+        assertNotNull(taf);
+        assertThat(taf.getWeatherConditions(), empty());
+        assertThat(taf.getBECMGs().get(0).getWeatherConditions(), hasSize(1));
+    }
 }

pom.xml

@@ -67,8 +67,8 @@
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <opencsv.version>5.7.1</opencsv.version>
         <pitest-junit5-plugin.version>1.1.0</pitest-junit5-plugin.version>
-        <pitest-maven.version>1.9.10</pitest-maven.version>
-        <slf4j-nop.version>2.0.3</slf4j-nop.version>
+        <pitest-maven.version>1.9.11</pitest-maven.version>
+        <slf4j-nop.version>2.0.4</slf4j-nop.version>
         <spotbugs-maven-plugin.version>4.7.3.0</spotbugs-maven-plugin.version>
         <sonar.organization>mivek-github</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>