From 889da1c4557b638b28d7b5e55104fb50632182ff Mon Sep 17 00:00:00 2001
From: Jeff Burke <Jeff.Burke@nrc-cnrc.gc.ca>
Date: Thu, 25 Sep 2014 08:19:09 -0700
Subject: [PATCH] s1651: fix compile warnings
---
projects/cadcAccessControl-Server/build.xml | 8 ++++----
.../src/ca/nrc/cadc/ac/server/PluginFactory.java | 2 ++
.../src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java | 4 ++--
.../ca/nrc/cadc/ac/server/web/AddUserMemberAction.java | 1 +
.../ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java | 1 +
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/projects/cadcAccessControl-Server/build.xml b/projects/cadcAccessControl-Server/build.xml
index 41e56c2e..ffce2a44 100644
--- a/projects/cadcAccessControl-Server/build.xml
+++ b/projects/cadcAccessControl-Server/build.xml
@@ -133,7 +133,7 @@
<target name="test" depends="compile-test,resources">
<echo message="Running test" />
- <!-- Run the junit test suite -->
+ Run the junit test suite
<echo message="Running test suite..." />
<junit printsummary="yes" haltonfailure="yes" fork="yes">
<classpath>
@@ -141,10 +141,10 @@
<pathelement path="${build}/test/class"/>
<pathelement path="${testingJars}"/>
</classpath>
- <!--<test name="ca.nrc.cadc.ac.server.ldap.LdapDAOTest" />-->
+ <test name="ca.nrc.cadc.ac.server.ldap.LdapDAOTest" />
<test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />
- <!--<test name="ca.nrc.cadc.ac.server.web.GroupActionFactoryTest" />-->
- <!--<test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />-->
+ <test name="ca.nrc.cadc.ac.server.web.GroupActionFactoryTest" />
+ <test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />
<formatter type="plain" usefile="false" />
</junit>
</target>
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
index 06d92772..caa18b20 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
@@ -112,6 +112,7 @@ public class PluginFactory
}
}
+ @SuppressWarnings("unchecked")
public <T extends Principal> GroupPersistence<T> getGroupPersistence()
{
GroupPersistence<T> ret = null;
@@ -136,6 +137,7 @@ public class PluginFactory
return ret;
}
+ @SuppressWarnings("unchecked")
public <T extends Principal> UserPersistence<T> getUserPersistence()
{
UserPersistence<T> ret = null;
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
index dad14550..aabfca8a 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
@@ -101,8 +101,7 @@ import javax.security.auth.x500.X500Principal;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-public class ACSearchRunner
- implements JobRunner
+public class ACSearchRunner implements JobRunner
{
private static Logger log = Logger.getLogger(ACSearchRunner.class);
@@ -149,6 +148,7 @@ public class ACSearchRunner
log.info(endMessage);
}
+ @SuppressWarnings("unchecked")
private void search()
{
try
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
index 3862f48e..d8a84b26 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
@@ -94,6 +94,7 @@ public class AddUserMemberAction extends GroupsAction
this.userIDType = userIDType;
}
+ @SuppressWarnings("unchecked")
public Object run()
throws Exception
{
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
index 67b34292..c9612f66 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
@@ -92,6 +92,7 @@ public class RemoveUserMemberAction extends GroupsAction
this.userIDType = userIDType;
}
+ @SuppressWarnings("unchecked")
public Object run()
throws Exception
{
--
GitLab