Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

Commit

Permalink
Merge pull request #549 from advancedtelematic/tidy/deadcode
Browse files Browse the repository at this point in the history 
Remove dead code
  • Loading branch information
@pattivacek
pattivacek authored Feb 5, 2018
2 parents 7815d2d + c32f6ff commit 42fdedc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 151 deletions.
116 changes: 0 additions & 116 deletions src/types.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,49 +20,6 @@ Package Package::fromJson(const std::string& json_str) {
return package;
}

Json::Value UpdateRequest::toJson() {
Json::Value json;
json["requestId"] = requestId;
switch (status) {
case Pending:
json["status"] = "Pending";
break;
case InFlight:
json["status"] = "InFlight";
break;
default:
throw std::logic_error("Unknown value for status");
}
json["packageId"] = packageId.toJson();
json["installPos"] = installPos;
json["createdAt"] = createdAt;
return json;
}

UpdateRequest UpdateRequest::fromJson(const std::string& json_str) {
Json::Reader reader;
Json::Value json;
reader.parse(json_str, json);
return fromJson(json);
}

UpdateRequest UpdateRequest::fromJson(const Json::Value& json) {
UpdateRequest ur;
ur.requestId = json["requestId"].asString();
std::string status = json["status"].asString();
if (status == "Pending") {
ur.status = Pending;
} else if (status == "InFlight") {
ur.status = InFlight;
} else {
throw std::runtime_error("Failed to parse UpdateRequest");
}
ur.packageId = data::Package::fromJson(Json::FastWriter().write(json["packageId"]));
ur.installPos = json["installPos"].asUInt();
ur.createdAt = json["createdAt"].asString();
return ur;
}

Json::Value UpdateAvailable::toJson() {
Json::Value json;
json["update_id"] = update_id;
Expand Down Expand Up @@ -169,79 +126,6 @@ UpdateReport UpdateReport::fromJson(const std::string& json_str) {
return update_report;
}

Json::Value InstalledFirmware::toJson() {
Json::Value json;
json["module"] = module;
json["firmware_id"] = firmware_id;
json["last_modified"] = last_modified;
return json;
}

InstalledFirmware InstalledFirmware::fromJson(const std::string& json_str) {
Json::Reader reader;
Json::Value json;
reader.parse(json_str, json);
InstalledFirmware installed_firmware;
installed_firmware.firmware_id = json["firmware_id"].asString();
installed_firmware.module = json["module"].asString();
installed_firmware.last_modified = json["last_modified"].asUInt();
return installed_firmware;
}

Json::Value InstalledPackage::toJson() {
Json::Value json;
json["package_id"] = package_id;
json["name"] = name;
json["description"] = description;
json["last_modified"] = last_modified;
return json;
}

InstalledPackage InstalledPackage::fromJson(const std::string& json_str) {
Json::Reader reader;
Json::Value json;
reader.parse(json_str, json);
InstalledPackage installed_package;
installed_package.package_id = json["package_id"].asString();
installed_package.name = json["name"].asString();
installed_package.description = json["description"].asString();
installed_package.last_modified = json["last_modified"].asUInt();
return installed_package;
}

Json::Value InstalledSoftware::toJson() {
Json::Value json;
json["packages"] = Json::arrayValue;
for (std::vector<InstalledPackage>::iterator it = packages.begin(); it != packages.end(); ++it) {
json["packages"].append(it->toJson());
}
json["firmwares"] = Json::arrayValue;
for (std::vector<InstalledFirmware>::iterator it = firmwares.begin(); it != firmwares.end(); ++it) {
json["firmwares"].append(it->toJson());
}
return json;
}

InstalledSoftware InstalledSoftware::fromJson(const std::string& json_str) {
Json::Reader reader;
Json::Value json;
reader.parse(json_str, json);
std::vector<InstalledPackage> packages;

for (unsigned int index = 0; index < json["packages"].size(); ++index) {
packages.push_back(InstalledPackage::fromJson(Json::FastWriter().write(json["packages"][index])));
}

std::vector<InstalledFirmware> firmwares;
for (unsigned int index = 0; index < json["firmwares"].size(); ++index) {
firmwares.push_back(InstalledFirmware::fromJson(Json::FastWriter().write(json["firmwares"][index])));
}
InstalledSoftware installed_software;
installed_software.packages = packages;
installed_software.firmwares = firmwares;
return installed_software;
}

PackageManagerCredentials::PackageManagerCredentials(const CryptoKey& cryptokey)
: tmp_ca_file("ostree-ca"), tmp_pkey_file("ostree-pkey"), tmp_cert_file("ostree-cert") {
tmp_ca_file.PutContents(cryptokey.getCa());
Expand Down
35 changes: 0 additions & 35 deletions src/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,6 @@ struct Package {

enum UpdateRequestStatus { Pending = 0, InFlight };

struct UpdateRequest {
UpdateRequestId requestId;
UpdateRequestStatus status;
Package packageId;
unsigned int installPos;
std::string createdAt;
Json::Value toJson();
static UpdateRequest fromJson(const std::string& json_str);
static UpdateRequest fromJson(const Json::Value& json);
};

struct UpdateAvailable {
std::string update_id;
std::string signature;
Expand Down Expand Up @@ -112,30 +101,6 @@ struct UpdateReport {
static UpdateReport fromJson(const std::string& json_str);
};

struct InstalledFirmware {
std::string module;
std::string firmware_id;
unsigned long long last_modified;
Json::Value toJson();
static InstalledFirmware fromJson(const std::string& json_str);
};

struct InstalledPackage {
std::string package_id;
std::string name;
std::string description;
unsigned long long last_modified;
Json::Value toJson();
static InstalledPackage fromJson(const std::string& json_str);
};

struct InstalledSoftware {
std::vector<InstalledPackage> packages;
std::vector<InstalledFirmware> firmwares;
Json::Value toJson();
static InstalledSoftware fromJson(const std::string& json_str);
};

class PackageManagerCredentials {
public:
PackageManagerCredentials(const CryptoKey& cryptokey);
Expand Down

0 comments on commit 42fdedc

Please sign in to comment.