Updating OWM to update Kotlin (#317)

The OWM library brings in a version of Kotlin with a CVE, this updates
the version without the CVE.

Signed-off-by: Jason Porter <lightguard.jp@gmail.com>

Author: LightGuard

openweathermap-workitem/src/main/java/org/jbpm/process/workitem/owm/DailyForecastWorkitemHandler.java

@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
-import net.aksingh.owmjapis.core.OWM;
+import net.aksingh.owmjapis.core.OWMPro;
 import net.aksingh.owmjapis.core.OWM.Country;
 import net.aksingh.owmjapis.model.DailyWeatherForecast;
 import net.aksingh.owmjapis.model.param.ForecastData;
@@ -67,7 +67,7 @@ public class DailyForecastWorkitemHandler extends AbstractLogOrThrowWorkItemHand
     private static final String RESULTS_VALUES = "DailyForecastData";
 
     private String apiKey;
-    private OWM owm;
+    private OWMPro owm;
 
     public DailyForecastWorkitemHandler(String apiKey) {
         this.apiKey = apiKey;
@@ -88,13 +88,14 @@ public void executeWorkItem(WorkItem workItem,
             DailyForecastData dfd = new DailyForecastData();
 
             if (owm == null) {
-                owm = new OWM(apiKey);
+                owm = new OWMPro(apiKey);
             }
 
             DailyWeatherForecast dailyWeatherForecast;
 
             if (countryCode == null) {
-                dailyWeatherForecast = owm.dailyWeatherForecastByCityName(cityName);
+                // 16 is the max count, unfortunately, the constant isn't exposed outside the library.
+                dailyWeatherForecast = owm.dailyWeatherForecastByCityName(cityName, 16);
             } else {
                 dailyWeatherForecast = owm.dailyWeatherForecastByCityName(cityName,
                                                                           Country.valueOf(countryCode));
@@ -150,7 +151,7 @@ public void abortWorkItem(WorkItem workItem,
     }
 
     // for testing
-    public void setOWM(OWM owm) {
+    public void setOWM(OWMPro owm) {
         this.owm = owm;
     }
 }

openweathermap-workitem/src/test/java/org/jbpm/process/workitem/owm/OpenWeatherMapWorkitemHandlerTest.java

@@ -19,7 +19,7 @@
 import java.util.Date;
 import java.util.List;
 
-import net.aksingh.owmjapis.core.OWM;
+import net.aksingh.owmjapis.core.OWMPro;
 import net.aksingh.owmjapis.core.OWM.Country;
 import net.aksingh.owmjapis.model.CurrentWeather;
 import net.aksingh.owmjapis.model.DailyWeatherForecast;
@@ -46,16 +46,16 @@
 import static org.powermock.api.mockito.PowerMockito.when;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({OWM.class, CurrentWeather.class, DailyWeatherForecast.class, Main.class, City.class, ForecastData.class, Temp.class})
+@PrepareForTest({OWMPro.class, CurrentWeather.class, DailyWeatherForecast.class, Main.class, City.class, ForecastData.class, Temp.class})
 @PowerMockIgnore({"jdk.internal.reflect.*"})
 public class OpenWeatherMapWorkitemHandlerTest extends AbstractBaseTest {
 
-    private OWM owm;
+    private OWMPro owm;
 
     @Before
     public void setUp() {
         try {
-            owm = PowerMockito.mock(OWM.class);
+            owm = PowerMockito.mock(OWMPro.class);
             CurrentWeather currentWeather = PowerMockito.mock(CurrentWeather.class);
             DailyWeatherForecast dailyWeatherForecast = PowerMockito.mock(DailyWeatherForecast.class);
             Main mainData = PowerMockito.mock(Main.class);
@@ -69,7 +69,7 @@ public void setUp() {
             when(owm.currentWeatherByCityName(anyString(),
                                               any(Country.class))).thenReturn(currentWeather);
 
-            when(owm.dailyWeatherForecastByCityName(anyString())).thenReturn(dailyWeatherForecast);
+            when(owm.dailyWeatherForecastByCityName(anyString(), any(Integer.class))).thenReturn(dailyWeatherForecast);
             when(owm.dailyWeatherForecastByCityName(anyString(),
                                                     any(Country.class))).thenReturn(dailyWeatherForecast);
 

pom.xml

@@ -55,7 +55,7 @@
     <version.github.jnr>0.15</version.github.jnr>
     <version.squareup.okhttp3>4.12.0</version.squareup.okhttp3>
     <version.rxjava>1.2.4</version.rxjava>
-    <version.owm>2.5.2.2</version.owm>
+    <version.owm>2.5.3.0</version.owm>
     <version.commons.net>3.6</version.commons.net>
     <version.wildfly.maven.plugin>1.2.1.Final</version.wildfly.maven.plugin>
     <version.war.plugin>3.2.2</version.war.plugin>