server: InvalidParameterException is expected

Logging the original exception in this case is confusing when reading
the test results as they look like real issues. Because
InvalidParameterException is expected, it's OK to not log.

java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

@@ -1,6 +1,6 @@
 /*
 Copyright 2011 Selenium committers
-Copyright 2011 - 2012 Software Freedom Conservancy
+Copyright 2011-2015 Software Freedom Conservancy
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -408,8 +408,8 @@ public boolean isBusy() {
    * @return a new instance built from the request.
    */
   @SuppressWarnings("unchecked")
-  public static <T extends RemoteProxy> T getNewInstance(RegistrationRequest request,
-                                                         Registry registry) {
+  public static <T extends RemoteProxy> T getNewInstance(
+      RegistrationRequest request, Registry registry) {
     try {
       String proxyClass = request.getRemoteProxyClass();
       if (proxyClass == null) {
@@ -428,13 +428,9 @@ public static <T extends RemoteProxy> T getNewInstance(RegistrationRequest reque
       } else {
         throw new InvalidParameterException("Error: " + proxy.getClass() + " isn't a remote proxy");
       }
-
     } catch (InvocationTargetException e) {
-      log.log(Level.SEVERE, e.getTargetException().getMessage(), e.getTargetException());
       throw new InvalidParameterException("Error: " + e.getTargetException().getMessage());
-
     } catch (Exception e) {
-      log.log(Level.SEVERE, e.getMessage(), e);
       throw new InvalidParameterException("Error: " + e.getMessage());
     }
   }

java/server/test/org/openqa/grid/plugin/RemoteProxyInheritanceTest.java

@@ -1,6 +1,6 @@
 /*
 Copyright 2011 Selenium committers
-Copyright 2011 Software Freedom Conservancy
+Copyright 2011-2015 Software Freedom Conservancy
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,23 +33,18 @@
 import java.util.HashMap;
 import java.util.Map;
 
-
 public class RemoteProxyInheritanceTest {
-
   private Registry registry = Registry.newInstance();
 
   @Test
   public void defaultToRemoteProxy() {
-
-
     RegistrationRequest req = RegistrationRequest.localWebdriverNoCapabilities();
 
     Map<String, Object> app1 = new HashMap<String, Object>();
     Map<String, Object> config = new HashMap<String, Object>();
     app1.put(APP, "app1");
     config.put(ID, "abc");
 
-
     req.addDesiredCapability(app1);
     req.setConfiguration(config);
 
@@ -58,7 +53,6 @@ public void defaultToRemoteProxy() {
     assertEquals(BaseRemoteProxy.class, p.getClass());
   }
 
-
   @Test
   public void existing() {
     Map<String, Object> app1 = new HashMap<String, Object>();
@@ -82,7 +76,6 @@ public void existing() {
     assertEquals("B", myRemoteProxy.getCustom2());
     assertEquals("A", myRemoteProxy.getConfig().get("Custom1"));
     assertEquals("B", myRemoteProxy.getConfig().get("Custom2"));
-
   }
 
   @Test(expected = InvalidParameterException.class)
@@ -106,7 +99,6 @@ public void notExtendingProxyExisting() {
     app1.put(APP, "app1");
     config.put(PROXY_CLASS, "java.lang.String");
 
-
     RegistrationRequest req = new RegistrationRequest();
     req.addDesiredCapability(app1);
     req.setConfiguration(config);
@@ -130,10 +122,8 @@ public void badConfig() {
     BaseRemoteProxy.getNewInstance(req, registry);
   }
 
-
   @After
-  public void tearDown(){
+  public void tearDown() {
     registry.stop();
   }
-
 }