java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 33 ----
java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 69
----------
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 19 --
5 files changed, 7 insertions(+), 129 deletions(-)
New commits:
commit c423f11113abca0b3293468c170ac09f1c7c4fba
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jul 31 17:43:02 2012 +0200
844048 - let errata.listPackages API return also packages associated
with unpublished errata
- changing hibernate mappings from date to timestamp to keep the time
within the dates in the API output
- removing unused methods and query
- list of errata packages get taken out of hibernate objects instead of making
additional cached statement queries and creating extra dto objects (side effect:
faster API)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index dc40fd9..a62ac0c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1906,39 +1906,6 @@ select distinct p.evr_id as id
</query>
</mode>
-
-<mode name="package_dto_for_errata"
class="com.redhat.rhn.frontend.dto.PackageDto">
- <query params="eid">
- select P.id,
- evr.epoch,
- PN.name,
- evr.version,
- evr.release,
- PA.label as arch_label,
- P.build_host,
- P.description,
- C.checksum,
- P.vendor,
- P.summary,
- P.cookie,
- P.copyright,
- P.path,
- P.build_time,
- P.package_size,
- P.payload_size,
- CT.label as checksum_type,
- TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS')
AS last_modified
- from rhnPackage P
- inner join rhnErrataPackage EP on P.id = EP.package_id
- inner join rhnPackageEvr evr on P.evr_id = evr.id
- inner join rhnPackageName pn on P.name_id = PN.id
- inner join rhnPackageArch PA on PA.id = P.package_arch_id
- inner join rhnChecksum C on C.id = P.checksum_id
- inner join rhnChecksumType CT on CT.id = C.CHECKSUM_TYPE_ID
- where EP.errata_id = :eid
- </query>
-</mode>
-
<mode name="channel_arch_and_org_access">
<query params="channel_id, org_id">
SELECT p.id, comp.package_arch_id, p.org_id org_package, octv.package_id org_access,
sctv.package_id shared_access
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
index 1b255c7..2810ffb 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package_satellite.hbm.xml
@@ -20,7 +20,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="payloadSize" type="long"
column="payload_size"/>
<property name="installedSize" type="long"
column="installed_size"/>
<property name="buildHost" type="string"
column="build_host"/>
- <property name="buildTime" type="date"
column="build_time"/>
+ <property name="buildTime" type="timestamp"
column="build_time"/>
<property name="vendor" type="string"
column="vendor"/>
<property name="payloadFormat" type="string"
column="payload_format"/>
<property name="compat" type="long"
column="compat"/>
@@ -28,9 +28,9 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="headerSignature" type="string"
column="header_sig"/>
<property name="copyright" type="string"
column="copyright"/>
<property name="cookie" type="string"
column="cookie"/>
- <property name="lastModified" type="date"
column="last_modified"/>
- <property name="created" type="date"
column="created"/>
- <property name="modified" type="date"
column="modified"/>
+ <property name="lastModified" type="timestamp"
column="last_modified"/>
+ <property name="created" type="timestamp"
column="created"/>
+ <property name="modified" type="timestamp"
column="modified"/>
<set name="packageKeys" lazy="true"
table="rhnPackageKeyAssociation"
cascade="save-update" >
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index efd756a..f86058c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -50,7 +50,6 @@ import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.CVE;
-import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.DuplicateErrataException;
import com.redhat.rhn.frontend.xmlrpc.InvalidAdvisoryReleaseException;
@@ -703,11 +702,11 @@ public class ErrataHandler extends BaseHandler {
Errata errata = lookupErrataReadOnly(advisoryName, loggedInUser.getOrg());
List<Map> toRet = new ArrayList<Map>();
- for (PackageDto dto : PackageManager.listPackageDtosForErrata(errata)) {
- toRet.add(PackageHelper.packageToMap(dto, loggedInUser));
+ for (Iterator iter = errata.getPackages().iterator(); iter.hasNext();) {
+ Package pkg = (Package) iter.next();
+ toRet.add(PackageHelper.packageToMap(pkg, loggedInUser));
}
return toRet;
-
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
index 923a28e..9f4e630 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java
@@ -19,7 +19,6 @@ import com.redhat.rhn.common.translation.Translator;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
import org.apache.commons.lang.StringUtils;
@@ -124,74 +123,6 @@ public class PackageHelper {
return pkgMap;
}
-
- /**
- * Utility method to convert a package to a map.
- * @param pkg The package to convert
- * @param user The user requesting the package conversion (used in calculating the
- * providing_channels attribute)
- * @return Returns a map representation of a package
- */
- public static Map packageToMap(PackageDto pkg, User user) {
-
- Map pkgMap = new HashMap();
-
- // deal with the providing channels first
- DataResult dr = PackageManager.providingChannels(user, pkg.getId());
- List channelLabels = new ArrayList();
- for (Iterator itr = dr.iterator(); itr.hasNext();) {
- Map map = (Map) itr.next();
- channelLabels.add(map.get("label"));
- }
- pkgMap.put("providing_channels", channelLabels);
-
-
- addEntry(pkgMap, "name",
- StringUtils.defaultString(pkg.getName()));
-
- addEntry(pkgMap, "epoch", StringUtils.defaultString(pkg.getEpoch()));
- addEntry(pkgMap, "version",
StringUtils.defaultString(pkg.getVersion()));
- addEntry(pkgMap, "release",
StringUtils.defaultString(pkg.getRelease()));
-
-
- addEntry(pkgMap, "arch_label", pkg.getArchLabel());
-
- addEntry(pkgMap, "id", pkg.getId());
- addEntry(pkgMap, "build_host",
- StringUtils.defaultString(pkg.getBuildHost()));
- addEntry(pkgMap, "description",
- StringUtils.defaultString(pkg.getDescription()));
- addEntry(pkgMap, "checksum",
- StringUtils.defaultString(pkg.getChecksum()));
- addEntry(pkgMap, "checksum_type",
- StringUtils.defaultString(
- pkg.getChecksumType()));
- addEntry(pkgMap, "vendor",
- StringUtils.defaultString(pkg.getVendor()));
- addEntry(pkgMap, "summary",
- StringUtils.defaultString(pkg.getSummary()));
- addEntry(pkgMap, "cookie",
- StringUtils.defaultString(pkg.getCookie()));
- addEntry(pkgMap, "license",
- StringUtils.defaultString(pkg.getCopyright()));
- addEntry(pkgMap, "path",
- StringUtils.defaultString(pkg.getPath()));
- addEntry(pkgMap, "file",
- StringUtils.defaultString(pkg.getFile()));
- addEntry(pkgMap, "build_date",
- Translator.date2String(pkg.getBuildTime()));
- addEntry(pkgMap, "last_modified_date", pkg.getLastModified());
-
- Long sz = pkg.getPackageSize();
- addEntry(pkgMap, "size", (sz == null) ? "" :
String.valueOf(sz));
-
- sz = pkg.getPayloadSize();
- addEntry(pkgMap, "payload_size", (sz == null) ? "" :
String.valueOf(sz));
-
- return pkgMap;
- }
-
-
private static void addEntry(Map map, String key, Object value) {
map.put(key, value);
}
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index 31760a2..2656870 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -42,7 +42,6 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageComparison;
-import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.UpgradablePackageListItem;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
@@ -1318,24 +1317,6 @@ public class PackageManager extends BaseManager {
arch.getLabel() + "/Debuginfo/" + dbgFilename;
}
-
- /**
- * List package's for an errata. This was mainly made for the errata xmlrpc
handler
- * was created to be fast.
- * @param errata the errata
- * @return list of Packages
- */
- public static List<PackageDto> listPackageDtosForErrata(Errata errata) {
-
- SelectMode m = ModeFactory.getMode("Package_queries",
"package_dto_for_errata");
- Map params = new HashMap();
- params.put("eid", errata.getId());
-
- DataResult result = m.execute(params);
- return result;
- }
-
-
/**
* Gets a package changelog from the file system
* @param pkg the package to get