modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 25 ++++------ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/security/UntrustedSSLProtocolSocketFactory.java | 5 +- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/DistributionManagerBeanTest.java | 9 ++- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java | 3 - 6 files changed, 24 insertions(+), 22 deletions(-)
New commits: commit 23419f815c97149f8028a525a27b55e5a3d32b61 Author: Joseph Marques joseph@redhat.com Date: Wed Aug 18 15:49:20 2010 -0400
get rid of some compiler errors / warnings
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java index ffbd94b..7218061 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java @@ -35,32 +35,27 @@ public class AuthorizationGWTServiceImpl extends AbstractGWTServiceImpl implemen private AuthorizationManagerLocal authorizationManager = LookupUtil.getAuthorizationManager();
public Set<Permission> getExplicitResourcePermissions(int resourceId) { - return SerialUtility.prepare( - new HashSet(authorizationManager.getExplicitResourcePermissions(getSessionSubject(), resourceId)), - "AuthorizationManager.getExplicitResourcePermissions"); + return SerialUtility.prepare(new HashSet<Permission>(authorizationManager.getExplicitResourcePermissions( + getSessionSubject(), resourceId)), "AuthorizationManager.getExplicitResourcePermissions"); }
public Set<Permission> getImplicitResourcePermissions(int resourceId) { - return SerialUtility.prepare( - new HashSet(authorizationManager.getImplicitResourcePermissions(getSessionSubject(), resourceId)), - "AuthorizationManager.getImplicitResourcePermissions"); + return SerialUtility.prepare(new HashSet<Permission>(authorizationManager.getImplicitResourcePermissions( + getSessionSubject(), resourceId)), "AuthorizationManager.getImplicitResourcePermissions"); }
public Set<Permission> getExplicitGroupPermissions(int groupId) { - return SerialUtility.prepare( - new HashSet(authorizationManager.getExplicitGroupPermissions(getSessionSubject(), groupId)), - "AuthorizationManager.getExplicitGroupPermissions"); + return SerialUtility.prepare(new HashSet<Permission>(authorizationManager.getExplicitGroupPermissions( + getSessionSubject(), groupId)), "AuthorizationManager.getExplicitGroupPermissions"); }
public Set<Permission> getImplicitGroupPermissions(int groupId) { - return SerialUtility.prepare( - new HashSet(authorizationManager.getImplicitGroupPermissions(getSessionSubject(), groupId)), - "AuthorizationManager.getImplicitGroupPermissions"); + return SerialUtility.prepare(new HashSet<Permission>(authorizationManager.getImplicitGroupPermissions( + getSessionSubject(), groupId)), "AuthorizationManager.getImplicitGroupPermissions"); }
public Set<Permission> getExplicitGlobalPermissions() { - return SerialUtility.prepare( - new HashSet(authorizationManager.getExplicitGlobalPermissions(getSessionSubject())), - "AuthorizationManager.getExplicitGlobalPermissions"); + return SerialUtility.prepare(new HashSet<Permission>(authorizationManager + .getExplicitGlobalPermissions(getSessionSubject())), "AuthorizationManager.getExplicitGlobalPermissions"); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index 82ffd48..cac0892 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -244,7 +244,7 @@ public final class CriteriaQueryGenerator { String returnValue = null; if (value instanceof String) { returnValue = "'" + prepareStringBindValue((String) value) + "'"; - } else if (value instanceof Enum) { + } else if (value instanceof Enum<?>) { // note: this strategy won't work for entities with multiple enums that are persisted differently EnumType type = getPersistenceEnumType(value.getClass()); if (type == EnumType.STRING) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 9d61cfd..61f613e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -637,7 +637,7 @@ public final class LookupUtil { } }
- @SuppressWarnings( { "unchecked", "unused" }) + @SuppressWarnings("unchecked") private static <T> T lookupRemote(Class<? super T> type) { try { return (T) lookup(getRemoteJNDIName(type)); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/security/UntrustedSSLProtocolSocketFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/security/UntrustedSSLProtocolSocketFactory.java index 1218e64..dca9282 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/security/UntrustedSSLProtocolSocketFactory.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/security/UntrustedSSLProtocolSocketFactory.java @@ -24,10 +24,13 @@ import java.net.Socket; import java.net.UnknownHostException; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509TrustManager; + import org.apache.commons.httpclient.protocol.Protocol; +import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory;
/** @@ -55,7 +58,7 @@ public class UntrustedSSLProtocolSocketFactory extends SSLProtocolSocketFactory
if (!isRegistered()) { if (untrustSSL == null) { - untrustSSL = new Protocol("https", new UntrustedSSLProtocolSocketFactory(), 443); + untrustSSL = new Protocol("https", (ProtocolSocketFactory) new UntrustedSSLProtocolSocketFactory(), 443); }
Protocol.registerProtocol("https", untrustSSL); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/DistributionManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/DistributionManagerBeanTest.java index e24f39c..037c071 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/DistributionManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/DistributionManagerBeanTest.java @@ -63,21 +63,24 @@ public class DistributionManagerBeanTest extends AbstractEJB3Test { assert distro == null; }
+ @SuppressWarnings("unchecked") public void testDistributionFiles() throws Exception { String kslabel = "testCreateDeleteRepo"; String kspath = "/tmp"; - int id = distManager.createDistribution(overlord, kslabel, kspath, distType).getId(); + // don't get id, if not needed downstream + //int id = distManager.createDistribution(overlord, kslabel, kspath, distType).getId(); + distManager.createDistribution(overlord, kslabel, kspath, distType); Distribution distro = distManager.getDistributionByLabel(kslabel);
DistributionFile distfile = new DistributionFile(distro, "vmlinux", "d41d8cd98f00b204e9800998ecf8427e"); EntityManager em = getEntityManager(); em.persist(distfile); - Query query = em.createNamedQuery(distfile.SELECT_BY_DIST_ID); + Query query = em.createNamedQuery(DistributionFile.SELECT_BY_DIST_ID);
query.setParameter("distId", distro.getId()); List<DistributionFile> results = query.getResultList(); assert results.size() != 0; - Query querydel = em.createNamedQuery(distfile.DELETE_BY_DIST_ID); + Query querydel = em.createNamedQuery(DistributionFile.DELETE_BY_DIST_ID);
querydel.setParameter("distId", distro.getId());
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java index 7b958ef..fd3db2e 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.server.resource.group.definition.framework.test;
import java.util.Arrays; +import java.util.Collections; import java.util.List;
import org.testng.annotations.Test; @@ -158,7 +159,7 @@ public class ExpressionEvaluatorTest extends AbstractEJB3Test { public void testWellFormedExpressions() throws Exception {
String[][] successTestCases = getSuccessTestCases(); - List<Integer> suppressedCases = Arrays.asList(); + List<Integer> suppressedCases = Collections.emptyList();
getTransactionManager().begin(); try {