Fix AppServer build errors in Eclipse with <4.6 target platforms

9aa3748 added dummy implementations for loadRoleInfo() and
loadUserInfo() to class MappedLoginService to fix compile errors in
Eclipse when using 4.6 target platform which brings Jetty 9.3 adding
these two methods. Unfortunately this causes errors when using non 4.6
target platform coming with an older Jetty version. Fix this by
extracting the anonymous subclass of MappedLoginService which allows to
suppress the unused private method errors in Eclipse.

Change-Id: I75baeea7ff4502ce9ef2b541b3c0555da5535d79
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
index c8857409cfa998061ac7a60d461d551b6b4fdd82..cca4f43dbdae55c3e1bbb1a6c3ec89d46b94d298 100644 (file)
--- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
+++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java
@@ -168,29 +168,38 @@ public class AppServer {
                return ctx;
        }
 
-       private void auth(ServletContextHandler ctx, Authenticator authType) {
-               final String role = "can-access";
+       static class TestMappedLoginService extends MappedLoginService {
+               private String role;
 
-               MappedLoginService users = new MappedLoginService() {
-                       @Override
-                       protected UserIdentity loadUser(String who) {
-                               return null;
-                       }
+               TestMappedLoginService(String role) {
+                       this.role = role;
+               }
 
-                       @Override
-                       protected void loadUsers() throws IOException {
-                               putUser(username, new Password(password), new String[] { role });
-                       }
+               @Override
+               protected UserIdentity loadUser(String who) {
+                       return null;
+               }
 
-                       protected String[] loadRoleInfo(KnownUser user) {
-                               return null;
-                       }
+               @Override
+               protected void loadUsers() throws IOException {
+                       putUser(username, new Password(password), new String[] { role });
+               }
 
-                       protected KnownUser loadUserInfo(String usrname) {
-                               return null;
-                       }
-               };
+               protected String[] loadRoleInfo(
+                               @SuppressWarnings("unused") KnownUser user) {
+                       return null;
+               }
+
+               protected KnownUser loadUserInfo(
+                               @SuppressWarnings("unused") String usrname) {
+                       return null;
+               }
+       }
+
+       private void auth(ServletContextHandler ctx, Authenticator authType) {
+               final String role = "can-access";
 
+               MappedLoginService users = new TestMappedLoginService(role);
                ConstraintMapping cm = new ConstraintMapping();
                cm.setConstraint(new Constraint());
                cm.getConstraint().setAuthenticate(true);