From a0e815f277c9ba1b91fa659fa2d3486189bc3c27 Mon Sep 17 00:00:00 2001 From: Lossy Date: Sun, 18 Dec 2022 02:59:23 -0600 Subject: [PATCH] Remove only_public from pics requests --- .../steam/handlers/steamapps/PICSRequest.java | 24 +------- .../steam/handlers/steamapps/SteamApps.java | 59 +++---------------- .../handlers/steamapps/SteamAppsTest.java | 4 +- 3 files changed, 15 insertions(+), 72 deletions(-) diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/PICSRequest.java b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/PICSRequest.java index 4e253cff..6e79e869 100644 --- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/PICSRequest.java +++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/PICSRequest.java @@ -9,13 +9,11 @@ public class PICSRequest { private long accessToken; - private boolean _public; - /** * Instantiate a PICS product info request */ public PICSRequest() { - this(0, 0L, true); + this(0, 0L); } /** @@ -24,7 +22,7 @@ public PICSRequest() { * @param id App or package ID\ */ public PICSRequest(int id) { - this(id, 0L, true); + this(id, 0L); } /** @@ -32,12 +30,10 @@ public PICSRequest(int id) { * * @param id App or package ID * @param accessToken PICS access token - * @param _public Get only public info */ - public PICSRequest(int id, long accessToken, boolean _public) { + public PICSRequest(int id, long accessToken) { this.id = id; this.accessToken = accessToken; - this._public = _public; } /** @@ -67,18 +63,4 @@ public long getAccessToken() { public void setAccessToken(long accessToken) { this.accessToken = accessToken; } - - /** - * @return The flag specifying if only public data is requested - */ - public boolean isPublic() { - return _public; - } - - /** - * @param _public The flag specifying if only public data is requested - */ - public void setPublic(boolean _public) { - this._public = _public; - } } diff --git a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/SteamApps.java b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/SteamApps.java index b8796bad..37da2bcf 100644 --- a/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/SteamApps.java +++ b/src/main/java/in/dragonbra/javasteam/steam/handlers/steamapps/SteamApps.java @@ -281,22 +281,8 @@ public JobID picsGetChangesSince(int lastChangeNumber, boolean sendAppChangeList * @param _package Package id requested. * @return The Job ID of the request. This can be used to find the appropriate {@link PICSProductInfoCallback}. */ - public JobID picsGetProductInfo(Integer app, Integer _package) { - return picsGetProductInfo(app, _package, true, false); - } - - - /** - * Request product information for an app or package - * Results are returned in a {@link PICSProductInfoCallback} callback. - * - * @param app App id requested. - * @param _package Package id requested. - * @param onlyPublic Whether to send only public information. - * @return The Job ID of the request. This can be used to find the appropriate {@link PICSProductInfoCallback}. - */ - public JobID picsGetProductInfo(Integer app, Integer _package, boolean onlyPublic) { - return picsGetProductInfo(app, _package, onlyPublic, false); + public JobID picsGetProductInfo(PICSRequest app, PICSRequest _package) { + return picsGetProductInfo(app, _package, false); } /** @@ -305,13 +291,12 @@ public JobID picsGetProductInfo(Integer app, Integer _package, boolean onlyPubli * * @param app App id requested. * @param _package Package id requested. - * @param onlyPublic Whether to send only public information. * @param metaDataOnly Whether to send only meta data. * @return The Job ID of the request. This can be used to find the appropriate {@link PICSProductInfoCallback}. */ - public JobID picsGetProductInfo(Integer app, Integer _package, boolean onlyPublic, boolean metaDataOnly) { - List apps = new ArrayList<>(); - List packages = new ArrayList<>(); + public JobID picsGetProductInfo(PICSRequest app, PICSRequest _package, boolean metaDataOnly) { + List apps = new ArrayList<>(); + List packages = new ArrayList<>(); if (app != null) { apps.add(app); @@ -321,7 +306,7 @@ public JobID picsGetProductInfo(Integer app, Integer _package, boolean onlyPubli packages.add(_package); } - return picsGetProductInfo(apps, packages, onlyPublic, metaDataOnly); + return picsGetProductInfo(apps, packages, metaDataOnly); } /** @@ -332,34 +317,8 @@ public JobID picsGetProductInfo(Integer app, Integer _package, boolean onlyPubli * @param packages List of package ids requested. * @return The Job ID of the request. This can be used to find the appropriate {@link PICSProductInfoCallback}. */ - public JobID picsGetProductInfo(Iterable apps, Iterable packages) { - return picsGetProductInfo(apps, packages, true, false); - } - - /** - * Request product information for a list of apps or packages - * Results are returned in a {@link PICSProductInfoCallback} callback. - * - * @param apps List of app ids requested. - * @param packages List of package ids requested. - * @param onlyPublic Whether to send only public information. - * @param metaDataOnly Whether to send only meta data. - * @return The Job ID of the request. This can be used to find the appropriate {@link PICSProductInfoCallback}. - */ - public JobID picsGetProductInfo(Iterable apps, Iterable packages, boolean onlyPublic, boolean metaDataOnly) { - List appRequests = new ArrayList<>(); - List packageRequests = new ArrayList<>(); - - for (Integer app : apps) { - appRequests.add(new PICSRequest(app, 0, onlyPublic)); - } - - for (Integer _package : packages) { - packageRequests.add(new PICSRequest(_package, 0, onlyPublic)); - } - - return picsGetProductInfo(appRequests, packageRequests, metaDataOnly); - + public JobID picsGetProductInfo(Iterable apps, Iterable packages) { + return picsGetProductInfo(apps, packages, false); } /** @@ -390,7 +349,7 @@ public JobID picsGetProductInfo(Iterable apps, Iterable msg = verifySend(EMsg.ClientPICSProductInfoRequest);