diff --git a/http-api/src/main/java/net/runelite/http/api/osbuddy/GrandExchangeClient.java b/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
similarity index 92%
rename from http-api/src/main/java/net/runelite/http/api/osbuddy/GrandExchangeClient.java
rename to http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
index d80a739d29..ffdfad2035 100644
--- a/http-api/src/main/java/net/runelite/http/api/osbuddy/GrandExchangeClient.java
+++ b/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
@@ -35,9 +35,9 @@ import okhttp3.Request;
import okhttp3.Response;
@Slf4j
-public class GrandExchangeClient
+public class OSBGrandExchangeClient
{
- public GrandExchangeResult lookupItem(int itemId) throws IOException
+ public OSBGrandExchangeResult lookupItem(int itemId) throws IOException
{
final HttpUrl url = RuneLiteAPI.getApiBase().newBuilder()
.addPathSegment("osb")
@@ -59,7 +59,7 @@ public class GrandExchangeClient
}
final InputStream in = response.body().byteStream();
- return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), GrandExchangeResult.class);
+ return RuneLiteAPI.GSON.fromJson(new InputStreamReader(in), OSBGrandExchangeResult.class);
}
catch (JsonParseException ex)
{
diff --git a/http-api/src/main/java/net/runelite/http/api/osbuddy/GrandExchangeResult.java b/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeResult.java
similarity index 97%
rename from http-api/src/main/java/net/runelite/http/api/osbuddy/GrandExchangeResult.java
rename to http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeResult.java
index 993ee0d567..13e5f5e8e4 100644
--- a/http-api/src/main/java/net/runelite/http/api/osbuddy/GrandExchangeResult.java
+++ b/http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeResult.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import lombok.Data;
@Data
-public class GrandExchangeResult
+public class OSBGrandExchangeResult
{
private int item_id;
private int buy_average;
diff --git a/http-service/src/main/java/net/runelite/http/service/osbuddy/GrandExchangeController.java b/http-service/src/main/java/net/runelite/http/service/osbuddy/OSBGrandExchangeController.java
similarity index 92%
rename from http-service/src/main/java/net/runelite/http/service/osbuddy/GrandExchangeController.java
rename to http-service/src/main/java/net/runelite/http/service/osbuddy/OSBGrandExchangeController.java
index 92ba9093e7..847c415772 100644
--- a/http-service/src/main/java/net/runelite/http/service/osbuddy/GrandExchangeController.java
+++ b/http-service/src/main/java/net/runelite/http/service/osbuddy/OSBGrandExchangeController.java
@@ -35,12 +35,12 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/osb/ge")
-public class GrandExchangeController
+public class OSBGrandExchangeController
{
- private final GrandExchangeService grandExchangeService;
+ private final OSBGrandExchangeService grandExchangeService;
@Autowired
- public GrandExchangeController(GrandExchangeService grandExchangeService)
+ public OSBGrandExchangeController(OSBGrandExchangeService grandExchangeService)
{
this.grandExchangeService = grandExchangeService;
}
diff --git a/http-service/src/main/java/net/runelite/http/service/osbuddy/GrandExchangeService.java b/http-service/src/main/java/net/runelite/http/service/osbuddy/OSBGrandExchangeService.java
similarity index 97%
rename from http-service/src/main/java/net/runelite/http/service/osbuddy/GrandExchangeService.java
rename to http-service/src/main/java/net/runelite/http/service/osbuddy/OSBGrandExchangeService.java
index f7addee899..797d7e76e2 100644
--- a/http-service/src/main/java/net/runelite/http/service/osbuddy/GrandExchangeService.java
+++ b/http-service/src/main/java/net/runelite/http/service/osbuddy/OSBGrandExchangeService.java
@@ -40,7 +40,7 @@ import org.sql2o.Sql2o;
@Service
@Slf4j
-public class GrandExchangeService
+public class OSBGrandExchangeService
{
private static final String CREATE_GRAND_EXCHANGE_PRICES = "CREATE TABLE IF NOT EXISTS `osb_ge` (\n"
+ " `item_id` int(11) NOT NULL,\n"
@@ -56,7 +56,7 @@ public class GrandExchangeService
private final Sql2o sql2o;
@Autowired
- public GrandExchangeService(@Qualifier("Runelite SQL2O") Sql2o sql2o)
+ public OSBGrandExchangeService(@Qualifier("Runelite SQL2O") Sql2o sql2o)
{
this.sql2o = sql2o;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
index cd4f3f050e..c26e39ebb5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
@@ -73,8 +73,8 @@ import net.runelite.client.ui.NavigationButton;
import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.StackFormatter;
import net.runelite.client.util.Text;
-import net.runelite.http.api.osbuddy.GrandExchangeClient;
-import net.runelite.http.api.osbuddy.GrandExchangeResult;
+import net.runelite.http.api.osbuddy.OSBGrandExchangeClient;
+import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
@PluginDescriptor(
name = "Grand Exchange",
@@ -86,7 +86,7 @@ public class GrandExchangePlugin extends Plugin
{
private static final int OFFER_CONTAINER_ITEM = 21;
private static final int OFFER_DEFAULT_ITEM_ID = 6512;
- private static final GrandExchangeClient CLIENT = new GrandExchangeClient();
+ private static final OSBGrandExchangeClient CLIENT = new OSBGrandExchangeClient();
private static final String OSB_GE_TEXT = "
OSBuddy Actively traded price: ";
private static final String BUY_LIMIT_GE_TEXT = "
Buy limit: ";
@@ -346,7 +346,7 @@ public class GrandExchangePlugin extends Plugin
try
{
- final GrandExchangeResult result = CLIENT.lookupItem(itemId);
+ final OSBGrandExchangeResult result = CLIENT.lookupItem(itemId);
final String text = geText.getText() + OSB_GE_TEXT + StackFormatter.formatNumber(result.getOverall_average());
geText.setText(text);
}