NIHVIVO-2254 Remove compiler warnings

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java

@@ -177,6 +177,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
     }
 
     /* *********************** Methods ************************************ */
+    @Override
 	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
             RequestedAction whatToAuth) {
         BasicPolicyDecision pd = new BasicPolicyDecision(Authorization.INCONCLUSIVE,"not yet set");
@@ -194,6 +195,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
     }
 
     /* ************************* visit methods ************************** */
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddResource action) {
         log.debug("doing AddResource");
 
@@ -209,9 +211,9 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
         return doQueries(queryStrs,parameters,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DropResource action) {
         log.debug("doing DropResource");
-        BasicPolicyDecision pd = new BasicPolicyDecision(Authorization.INCONCLUSIVE, "");
 
         List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
         if( queryStrs == null || queryStrs.size() ==0 )
@@ -225,6 +227,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
         return doQueries(queryStrs,parameters,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddObjectPropStmt action) {
         log.debug("doing AddObjectPropStmt in visit()");
 
@@ -242,6 +245,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
         return doQueries(queryStrs,parameters,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DropObjectPropStmt action) {
         log.debug("doing DropObjectPropStmt");
 
@@ -259,6 +263,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
         return doQueries(queryStrs,parameters,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddDataPropStmt action) {
         log.debug("doing AddDataPropStmt");
 
@@ -275,6 +280,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
         return doQueries(queryStrs,parameters,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DropDataPropStmt action) {
         log.debug("doing DropDataPropStmt");
 
@@ -330,18 +336,6 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
         return q;
     }
 
-    private QuerySolutionMap idsToSolutionMap(IdentifierBundle id){
-        // right now we can only turn netids into QSMs
-        String netid = getNetid(id);
-        if( netid == null || netid.length() == 0)
-            return null;
-
-        QuerySolutionMap qsm = new QuerySolutionMap();
-        Model m = ModelFactory.createDefaultModel();
-        qsm.add("netid",m.createLiteral(netid));
-        return qsm;
-    }
-
     private String getNetid(IdentifierBundle whoToAuth) {
         String netidStr = null;
         for(Identifier id : whoToAuth){
@@ -364,7 +358,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
      * @author bdc34
      *
      */
-    public class ContextSetup implements ServletContextListener {
+    public static class ContextSetup implements ServletContextListener {
         @Override
 		public void contextInitialized(ServletContextEvent sce) {
             try{
@@ -433,64 +427,81 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
     "PREFIX vivo: <http://vivo.library.cornell.edu/ns/0.1#>\n"+
     "PREFIX vitro: <"+ VitroVocabulary.vitroURI+">\n";
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, CreateOwlClass action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, RemoveOwlClass action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DefineDataProperty action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DefineObjectProperty action){
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddNewUser action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, RemoveUser action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, LoadOntology action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, RebuildTextIndex action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, UpdateTextIndex action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, UploadFile action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, ServerStatus action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, EditDataPropStmt action) {
         return UNAUTH;
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, EditObjPropStmt action) {
         return UNAUTH;
     }
 
     private final PolicyDecision UNAUTH = new PolicyDecision(){
+        @Override
 		public Authorization getAuthorized() {return Authorization.UNAUTHORIZED; }
+        @Override
 		public String getMessage() {
             return "JenaNetidPolicy doesn't authorize admin or onto editing actions";
         }
+        @Override
 		public String getDebuggingInfo() { return ""; }
+        @Override
 		public String getStackTrace() { return ""; }
     };
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SparqlPolicy.java

@@ -105,6 +105,7 @@ public class SparqlPolicy extends DefaultInconclusivePolicy implements VisitingP
     }
 
     /* *********************** Methods ************************************ */
+    @Override
 	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
             RequestedAction whatToAuth) {        
         if( whoToAuth == null )
@@ -161,72 +162,91 @@ public class SparqlPolicy extends DefaultInconclusivePolicy implements VisitingP
 
     /* ***************** Visit methods ********************** */
     private final String pkg = "edu.cornell.mannlib.vitro.webapp.auth.requestedAction.";
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddObjectPropStmt action) {
         return doQueries(actionToQueryStr.get(pkg +"AddObjectPropStmt"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DropResource action) {
         return doQueries(actionToQueryStr.get(pkg +"DropResource"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DropDataPropStmt action) {
         return doQueries(actionToQueryStr.get(pkg +"DropDataPropStmt"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DropObjectPropStmt action) {
         return doQueries(actionToQueryStr.get(pkg +"DropObjectPropStmt"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddResource action) {
         return doQueries(actionToQueryStr.get(pkg +"AddResource"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddDataPropStmt action) {
         return doQueries(actionToQueryStr.get(pkg +"AddDataPropStmt"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, UploadFile action) {
         return doQueries(actionToQueryStr.get(pkg +"UploadFile"),ids,action);
     }
 
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, EditDataPropStmt action) {
         return doQueries(actionToQueryStr.get(pkg +"EditDataPropStmt"),ids,action);
     }
 
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, EditObjPropStmt action) {
         return doQueries(actionToQueryStr.get(pkg +"EditObjPropStmt"),ids,action);
     }
 
     /* **** Currently the following actions are unauthorized by this policy **** */
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, CreateOwlClass action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, RemoveOwlClass action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, DefineDataProperty action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids,
             DefineObjectProperty action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, ServerStatus action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, AddNewUser action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, RemoveUser action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, LoadOntology action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, RebuildTextIndex action) {
         return UNAUTH;
     }
+    @Override
 	public PolicyDecision visit(IdentifierBundle ids, UpdateTextIndex action) {
         return UNAUTH;
     }
@@ -234,11 +254,15 @@ public class SparqlPolicy extends DefaultInconclusivePolicy implements VisitingP
     private static final Log log = LogFactory.getLog(SparqlPolicy.class.getName());
     
     private final PolicyDecision UNAUTH = new PolicyDecision(){
+        @Override
 		public Authorization getAuthorized() {return Authorization.UNAUTHORIZED; }
+        @Override
 		public String getMessage() {
             return name + " SparqlPolicy doesn't authorize admin or onto editing actions";
         }
+        @Override
 		public String getDebuggingInfo() { return ""; }
+        @Override
 		public String getStackTrace() { return ""; }
     };