http-api: RxJava async calls

http-api/pom.xml

@@ -79,6 +79,11 @@
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.reactivex.rxjava2</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>2.2.10</version>
+		</dependency>
 	</dependencies>
 
 	<build>

http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java

@@ -25,6 +25,7 @@
 package net.runelite.http.api.osbuddy;
 
 import com.google.gson.JsonParseException;
+import io.reactivex.Observable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -37,7 +38,7 @@ import okhttp3.Response;
 @Slf4j
 public class OSBGrandExchangeClient
 {
-	public OSBGrandExchangeResult lookupItem(int itemId) throws IOException
+	public Observable<OSBGrandExchangeResult> lookupItem(int itemId)
 	{
 		final HttpUrl url = RuneLiteAPI.getApiBase().newBuilder()
 			.addPathSegment("osb")
@@ -47,7 +48,9 @@ public class OSBGrandExchangeClient
 
 		log.debug("Built URI: {}", url);
 
-		final Request request = new Request.Builder()
+		return Observable.defer(() ->
+		{
+			Request request = new Request.Builder()
 				.url(url)
 				.build();
 
@@ -59,11 +62,12 @@ public class OSBGrandExchangeClient
 				}
 
 				final InputStream in = response.body().byteStream();
-			return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), OSBGrandExchangeResult.class);
+				return Observable.just(RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), OSBGrandExchangeResult.class));
 			}
-		catch (JsonParseException ex)
+			catch (JsonParseException e)
 			{
-			throw new IOException(ex);
+				return Observable.error(e);
 			}
+		});
 	}
 }

runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java

@@ -25,15 +25,15 @@
  */
 package net.runelite.client.plugins.chatcommands;
 
-import javax.inject.Singleton;
-import net.runelite.api.vars.AccountType;
 import com.google.inject.Provides;
+import io.reactivex.schedulers.Schedulers;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
@@ -48,6 +48,7 @@ import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WidgetLoaded;
+import net.runelite.api.vars.AccountType;
 import net.runelite.api.widgets.Widget;
 import static net.runelite.api.widgets.WidgetID.KILL_LOGS_GROUP_ID;
 import net.runelite.api.widgets.WidgetInfo;
@@ -74,7 +75,6 @@ import net.runelite.http.api.hiscore.SingleHiscoreSkillResult;
 import net.runelite.http.api.hiscore.Skill;
 import net.runelite.http.api.item.ItemPrice;
 import net.runelite.http.api.osbuddy.OSBGrandExchangeClient;
-import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
 import org.apache.commons.text.WordUtils;
 
 @PluginDescriptor(
@@ -822,16 +822,11 @@ public class ChatCommandsPlugin extends Plugin
 		if (!results.isEmpty())
 		{
 			ItemPrice item = retrieveFromList(results, search);
-			OSBGrandExchangeResult osbresult = new OSBGrandExchangeResult();
+			CLIENT.lookupItem(item.getId())
-			try
+				.subscribeOn(Schedulers.single())
+				.subscribe(
+					(osbresult) ->
 					{
-				osbresult = CLIENT.lookupItem(item.getId());
-			}
-			catch (IOException e)
-			{
-				log.error("Error looking up prices", e);
-			}
-
 						int itemId = item.getId();
 						int itemPrice = itemManager.getItemPrice(itemId);
 
@@ -866,6 +861,8 @@ public class ChatCommandsPlugin extends Plugin
 						chatMessageManager.update(messageNode);
 						client.refreshChat();
 					}
+				);
+		}
 	}
 
 	/**

runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java

@@ -26,7 +26,7 @@ package net.runelite.client.plugins.examine;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import java.io.IOException;
+import io.reactivex.schedulers.Schedulers;
 import java.time.Instant;
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -57,7 +57,6 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.util.StackFormatter;
 import net.runelite.http.api.examine.ExamineClient;
 import net.runelite.http.api.osbuddy.OSBGrandExchangeClient;
-import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
 
 /**
  * Submits examine info to the api
@@ -365,20 +364,17 @@ public class ExaminePlugin extends Plugin
 
 			if (gePrice > 0)
 			{
-				OSBGrandExchangeResult osbresult = new OSBGrandExchangeResult();
+				int finalQuantity = quantity;
-				try
+				CLIENT.lookupItem(id)
+					.subscribeOn(Schedulers.single())
+					.subscribe(
+						(osbresult) ->
 						{
-					osbresult = CLIENT.lookupItem(id);
-				}
-				catch (IOException e)
-				{
-					log.error(e.toString());
-				}
 							message
 								.append(ChatColorType.NORMAL)
 								.append(" GE  ")
 								.append(ChatColorType.HIGHLIGHT)
-					.append(StackFormatter.formatNumber(gePrice * quantity));
+								.append(StackFormatter.formatNumber(gePrice * finalQuantity));
 
 							if (osbresult != null)
 							{
@@ -386,10 +382,10 @@ public class ExaminePlugin extends Plugin
 									.append(ChatColorType.NORMAL)
 									.append(" OSB  ")
 									.append(ChatColorType.HIGHLIGHT)
-						.append(StackFormatter.formatNumber(osbresult.getOverall_average() * quantity));
+									.append(StackFormatter.formatNumber(osbresult.getOverall_average() * finalQuantity));
 							}
 
-				if (quantity > 1)
+							if (finalQuantity > 1)
 							{
 								message
 									.append(ChatColorType.NORMAL)
@@ -399,6 +395,9 @@ public class ExaminePlugin extends Plugin
 									.append(ChatColorType.NORMAL)
 									.append("ea)");
 							}
+						},
+						(e) -> log.error(e.toString())
+					);
 			}
 
 			if (alchPrice > 0)

runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java

@@ -30,8 +30,8 @@ package net.runelite.client.plugins.grandexchange;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.inject.Provides;
+import io.reactivex.schedulers.Schedulers;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Map;
@@ -58,8 +58,8 @@ import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.GrandExchangeOfferChanged;
 import net.runelite.api.events.MenuEntryAdded;
-import net.runelite.api.events.WidgetLoaded;
 import net.runelite.api.events.ScriptCallbackEvent;
+import net.runelite.api.events.WidgetLoaded;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetID;
 import net.runelite.api.widgets.WidgetInfo;
@@ -83,7 +83,6 @@ import net.runelite.client.util.Text;
 import net.runelite.http.api.ge.GrandExchangeClient;
 import net.runelite.http.api.ge.GrandExchangeTrade;
 import net.runelite.http.api.osbuddy.OSBGrandExchangeClient;
-import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
 
 @PluginDescriptor(
 	name = "Grand Exchange",
@@ -547,16 +546,16 @@ public class GrandExchangePlugin extends Plugin
 				return;
 			}
 
-			try
+			CLIENT.lookupItem(itemId)
+				.subscribeOn(Schedulers.single())
+				.subscribe(
+					(osbresult) ->
 					{
-				final OSBGrandExchangeResult result = CLIENT.lookupItem(itemId);
+						final String text = geText.getText() + OSB_GE_TEXT + StackFormatter.formatNumber(osbresult.getOverall_average());
-				final String text = geText.getText() + OSB_GE_TEXT + StackFormatter.formatNumber(result.getOverall_average());
 						geText.setText(text);
-			}
+					},
-			catch (IOException e)
+					(e) -> log.debug("Error getting price of item {}", itemId, e)
-			{
+				);
-				log.debug("Error getting price of item {}", itemId, e);
-			}
 		});
 	}