ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1727499 [1/5] - in /ace/trunk: ./ org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/ org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/ org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/ org.apache....
Date Fri, 29 Jan 2016 08:59:34 GMT
Author: jawi
Date: Fri Jan 29 08:59:31 2016
New Revision: 1727499

URL: http://svn.apache.org/viewvc?rev=1727499&view=rev
Log:
Some additional cleanups:

- removed the old TestNG reference from the gradle script;
- moved the UPnP based discovery to ace-extras;
- log messages about empty OBRs on debug level instead of error level (web UI);
- fix reference to AutoConf in performance scripts;
- remove lots of compiler warnings;


Removed:
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/constants/
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/upnp/
    ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/upnp/
    ace/trunk/org.apache.ace.discovery/upnp.bnd
Modified:
    ace/trunk/build.gradle
    ace/trunk/org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/BaseAgentControllerTest.java
    ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentDeploymentTest.java
    ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
    ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BaseAgentTest.java
    ace/trunk/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/Launcher.java
    ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/Activator.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/AgentContextImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ComponentBase.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ConfigurationHandlerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DefaultController.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DependencyTrackerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DiscoveryHandlerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventLoggerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventsHandlerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackHandlerImpl.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStore.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStoreManager.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ResettableTimer.java
    ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/UpdateHandlerBase.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/ConnectionHandlerImplTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/CustomControllerTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/DeploymentHandlerImplTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/EventLoggerImplTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackChannelImplTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreManagerTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/BaseAgentTest.java
    ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
    ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
    ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/impl/AuthenticationServiceImpl.java
    ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessor.java
    ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessor.java
    ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/password/PasswordAuthenticationProcessor.java
    ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/impl/AuthenticationServiceImplTest.java
    ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessorTest.java
    ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessorTest.java
    ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/password/PasswordAuthenticationProcessorTest.java
    ace/trunk/org.apache.ace.builder/src/org/apache/ace/builder/DeploymentPackageBuilder.java
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/BaseRepositoryAdminTest.java
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/ClientAutomationTest.java
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/RepositoryAdminTest.java
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/StatefulTargetRepositoryTest.java
    ace/trunk/org.apache.ace.client.repository.itest/src/org/apache/ace/it/repositoryadmin/TemplateProcessorTest.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/base/VelocityArtifactPreprocessor.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/impl/Activator.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/bundle/impl/BundleHelperImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/impl/Activator.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/configuration/impl/ConfigurationHelperImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/helper/user/impl/UserHelperImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/Activator.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/AssociationRepositoryImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/DeploymentArtifactImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/DeploymentVersionObjectImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/DeploymentVersionRepositoryImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ObjectRepositoryImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/RepositoryAdminLoginContextImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/RepositoryObjectImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/RepositoryPropertyResolver.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/RepositorySerializer.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/RepositorySet.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/TargetPropertyResolver.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetObjectImpl.java
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/stateful/impl/StatefulTargetRepositoryImpl.java
    ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/ArtifactTest.java
    ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/ModelTest.java
    ace/trunk/org.apache.ace.client.repository/test/org/apache/ace/client/repository/impl/RepositoryObjectImplTest.java
    ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/DPHelper.java
    ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
    ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceManagerImpl.java
    ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/Configurator.java
    ace/trunk/org.apache.ace.configurator/src/org/apache/ace/configurator/useradmin/task/UpdateUserAdminTask.java
    ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/ConfiguratorTest.java
    ace/trunk/org.apache.ace.configurator/test/org/apache/ace/configurator/MockConfigAdmin.java
    ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/ConnectionFactoryImpl.java
    ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/UrlCredentialsFactory.java
    ace/trunk/org.apache.ace.connectionfactory/test/org/apache/ace/connectionfactory/impl/ConnectionFactoryImplTest.java
    ace/trunk/org.apache.ace.connectionfactory/test/org/apache/ace/connectionfactory/impl/UrlCredentialsFactoryTest.java
    ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
    ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/provider/filebased/FileBasedProvider.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/repositorybased/BaseRepositoryHandler.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/repositorybased/DeploymentArtifactCollector.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/repositorybased/DeploymentPackageVersionCollector.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProvider.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/service/impl/Activator.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/service/impl/DeploymentServiceImpl.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/AgentDeploymentServlet.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/servlet/DeploymentServlet.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/streamgenerator/impl/StreamGeneratorImpl.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/task/Activator.java
    ace/trunk/org.apache.ace.deployment/src/org/apache/ace/deployment/util/test/TestProvider.java
    ace/trunk/org.apache.ace.deployment/test/org/apache/ace/deployment/provider/repositorybased/CacheTest.java
    ace/trunk/org.apache.ace.deployment/test/org/apache/ace/deployment/provider/repositorybased/RepositoryBasedProviderTest.java
    ace/trunk/org.apache.ace.deployment/test/org/apache/ace/deployment/servlet/DeploymentServletTest.java
    ace/trunk/org.apache.ace.deployment/test/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/Activator.java
    ace/trunk/org.apache.ace.discovery/src/org/apache/ace/discovery/property/PropertyBasedDiscovery.java
    ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/PropertyBasedDiscoveryTest.java
    ace/trunk/org.apache.ace.discovery/test/org/apache/ace/discovery/property/SimpleDiscoveryTest.java
    ace/trunk/org.apache.ace.feedback.common/src/org/apache/ace/feedback/Event.java
    ace/trunk/org.apache.ace.feedback.common/test/org/apache/ace/feedback/EventTest.java
    ace/trunk/org.apache.ace.gogo.servlet/src/org/apache/ace/gogo/servlet/ScriptServlet.java
    ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/queue/QueueCommands.java
    ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/repo/CommandResource.java
    ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/repo/ContinuousDeployer.java
    ace/trunk/org.apache.ace.gogo/src/org/apache/ace/gogo/repo/RepositoryUtil.java
    ace/trunk/org.apache.ace.http.itest/src/org/apache/ace/it/http/ServletConfiguratorIntegrationTest.java
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/listener/Activator.java
    ace/trunk/org.apache.ace.http/src/org/apache/ace/http/redirector/Activator.java
    ace/trunk/org.apache.ace.identification/src/org/apache/ace/identification/property/Activator.java
    ace/trunk/org.apache.ace.log.itest/src/org/apache/ace/it/log/LogIntegrationTest.java
    ace/trunk/org.apache.ace.log.server.ui/src/org/apache/ace/log/server/ui/LogViewerExtension.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/listener/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/listener/ListenerImpl.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/listener/LogCache.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/servlet/LogServlet.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/store/impl/LogStoreImpl.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/server/task/LogSyncTask.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/LogConfigurator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/LogSyncConfigurator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/impl/Activator.java
    ace/trunk/org.apache.ace.log/src/org/apache/ace/log/target/store/impl/LogStoreImpl.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/LogEventTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/server/servlet/LogServletTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/server/store/impl/LogStoreImplConcurrencyTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/server/store/impl/ServerLogStoreTester.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/server/task/LogTaskTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/store/impl/GatewayLogStoreTest.java
    ace/trunk/org.apache.ace.log/test/org/apache/ace/log/target/task/LogSyncTaskTest.java
    ace/trunk/org.apache.ace.obr/src/org/apache/ace/obr/storage/file/BundleFileStore.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/bindex/Index.java
    ace/trunk/org.apache.ace.obr/src/org/osgi/impl/bundle/obr/resource/BundleInfo.java
    ace/trunk/org.apache.ace.range.api/src/org/apache/ace/range/SortedRangeSet.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/impl/RepositoryFactory.java
    ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
    ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/Processor.java
    ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/ResourceStore.java
    ace/trunk/org.apache.ace.resourceprocessor.useradmin/src/org/apache/ace/resourceprocessor/useradmin/impl/UserAdminStore.java
    ace/trunk/org.apache.ace.scheduler/src/org/apache/ace/scheduler/Scheduler.java
    ace/trunk/org.apache.ace.tageditor/src/org/apache/ace/tageditor/ACETagEditorExtension.java
    ace/trunk/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
    ace/trunk/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java
    ace/trunk/org.apache.ace.useradmin.ui/src/org/apache/ace/useradmin/ui/editor/impl/UserEditorImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierResolverState.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifyEnvironmentImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/ui/ACEVerifierExtension.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/ui/VerificationResult.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/CapabilitySet.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/capabilityset/SimpleFilter.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/ResolverImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/Util.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/ManifestParser.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/R4Library.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
    ace/trunk/org.apache.ace.verifier/test/org/apache/ace/deployment/verifier/impl/VerifierTest.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/AddArtifactWindow.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/EditWindow.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/OBRUtil.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/UploadHelper.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
    ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
    ace/trunk/run-server-allinone/scripts/setup.gogo

Modified: ace/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ace/trunk/build.gradle?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/build.gradle (original)
+++ ace/trunk/build.gradle Fri Jan 29 08:59:31 2016
@@ -33,9 +33,6 @@ subprojects {
   if (bndProject != null) {
     plugins.apply 'biz.aQute.bnd'
     
-    dependencies {
-      testCompile files("${rootDir}/cnf/lib/testng/testng-6.5.2.jar");
-    }
     test {
       useTestNG()
     }

Modified: ace/trunk/org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/BaseAgentControllerTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/BaseAgentControllerTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/BaseAgentControllerTest.java (original)
+++ ace/trunk/org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/BaseAgentControllerTest.java Fri Jan 29 08:59:31 2016
@@ -116,7 +116,7 @@ public abstract class BaseAgentControlle
     public static class StubDeploymentServlet extends HttpServlet {
         private static final long serialVersionUID = 1L;
 
-        private final Map<String, TestPackage> m_packages = new HashMap<String, TestPackage>();
+        private final Map<String, TestPackage> m_packages = new HashMap<>();
         private final String m_agentId;
 
         public StubDeploymentServlet(String agentId, TestPackage... testPackages) {
@@ -314,7 +314,7 @@ public abstract class BaseAgentControlle
     }
 
     protected void configureAgent(ConfigurationHandler handler, String... configuration) {
-        Map<String, String> config = new HashMap<String, String>();
+        Map<String, String> config = new HashMap<>();
         for (int i = 0; i < configuration.length; i += 2) {
             config.put(configuration[i], configuration[i + 1]);
         }

Modified: ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentDeploymentTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentDeploymentTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentDeploymentTest.java (original)
+++ ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentDeploymentTest.java Fri Jan 29 08:59:31 2016
@@ -95,7 +95,7 @@ public class AgentDeploymentTest extends
 
         private static final String BACKOFF_TIME = "1";
 
-        private final Map<String, TestPackage> m_packages = new HashMap<String, TestPackage>();
+        private final Map<String, TestPackage> m_packages = new HashMap<>();
         private final String m_agentId;
         private Failure m_failure;
 
@@ -256,7 +256,7 @@ public class AgentDeploymentTest extends
             return true;
         }
 
-        private final Map<String, List<Map<String, String>>> m_topics = new HashMap<String, List<Map<String, String>>>();
+        private final Map<String, List<Map<String, String>>> m_topics = new HashMap<>();
 
         public boolean containsTopic(String topic) {
             synchronized (m_topics) {
@@ -282,7 +282,7 @@ public class AgentDeploymentTest extends
         public Map<String, List<Map<String, String>>> getTopics() {
             Map<String, List<Map<String, String>>> result;
             synchronized (m_topics) {
-                result = new HashMap<String, List<Map<String, String>>>(m_topics);
+                result = new HashMap<>(m_topics);
             }
             return result;
         }
@@ -296,7 +296,7 @@ public class AgentDeploymentTest extends
             synchronized (m_topics) {
                 List<Map<String, String>> payloads = m_topics.get(topic);
                 if (payloads == null) {
-                    payloads = new ArrayList<Map<String, String>>();
+                    payloads = new ArrayList<>();
                     m_topics.put(topic, payloads);
                 }
                 payloads.add(payload);
@@ -662,7 +662,7 @@ public class AgentDeploymentTest extends
     }
 
     private Map<String, String> createAgentConfiguration(boolean useStreaming, int syncInterval) {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(AgentConstants.CONFIG_DISCOVERY_SERVERURLS, String.format("http://localhost:%d/", TestConstants.PORT));
         props.put(AgentConstants.CONFIG_IDENTIFICATION_AGENTID, AGENT_ID);
         props.put(AgentConstants.CONFIG_LOGGING_LEVEL, LOGLEVEL.name());
@@ -753,7 +753,7 @@ public class AgentDeploymentTest extends
     }
 
     private void waitForEventReceived(String topic, String... properties) throws Exception {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         for (int i = 0; i < properties.length; i += 2) {
             props.put(properties[i], properties[i + 1]);
         }

Modified: ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java (original)
+++ ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java Fri Jan 29 08:59:31 2016
@@ -52,16 +52,16 @@ public class AgentExtensionTest extends
 
         assertNull(locateService(AgentControl.class));
 
-        ServiceRegistration idreg1 = registerIdentification("TEST1", 1);
+        ServiceRegistration<?> idreg1 = registerIdentification("TEST1", 1);
         assertNull(locateService(AgentControl.class));
-        ServiceRegistration direg1 = registerDiscovery(new URL("http://test1"), 1);
+        ServiceRegistration<?> direg1 = registerDiscovery(new URL("http://test1"), 1);
         assertNull(locateService(AgentControl.class));
-        ServiceRegistration coreg1 = registerConnectionHandler();
+        ServiceRegistration<?> coreg1 = registerConnectionHandler();
         assertNotNull(locateService(AgentControl.class));
 
         assertEquals("TEST1", locateService(AgentControl.class).getAgentId());
 
-        ServiceRegistration idreg2 = registerIdentification("TEST2", 2);
+        ServiceRegistration<?> idreg2 = registerIdentification("TEST2", 2);
 
         assertEquals("TEST2", locateService(AgentControl.class).getAgentId());
 
@@ -82,10 +82,10 @@ public class AgentExtensionTest extends
         resetAgentBundleState();
     }
 
-    private ServiceRegistration registerIdentification(final String id, final int rank) {
+    private ServiceRegistration<IdentificationHandler> registerIdentification(final String id, final int rank) {
         Dictionary<String, Object> props = new Hashtable<>();
         props.put(Constants.SERVICE_RANKING, rank);
-        return m_bundleContext.registerService(IdentificationHandler.class.getName(), new IdentificationHandler() {
+        return m_bundleContext.registerService(IdentificationHandler.class, new IdentificationHandler() {
             @Override
             public String getAgentId() {
                 return id;
@@ -98,11 +98,11 @@ public class AgentExtensionTest extends
         }, props);
     }
 
-    private ServiceRegistration registerDiscovery(final URL url, final int rank) {
+    private ServiceRegistration<DiscoveryHandler> registerDiscovery(final URL url, final int rank) {
         Dictionary<String, Object> props = new Hashtable<>();
         props.put(Constants.SERVICE_RANKING, rank);
         return m_bundleContext
-            .registerService(DiscoveryHandler.class.getName(), new DiscoveryHandler() {
+            .registerService(DiscoveryHandler.class, new DiscoveryHandler() {
 
                 @Override
                 public URL getServerUrl() {
@@ -111,9 +111,9 @@ public class AgentExtensionTest extends
             }, props);
     }
 
-    private ServiceRegistration registerConnectionHandler() {
+    private ServiceRegistration<ConnectionHandler> registerConnectionHandler() {
         return m_bundleContext
-            .registerService(ConnectionHandler.class.getName(), new ConnectionHandler() {
+            .registerService(ConnectionHandler.class, new ConnectionHandler() {
 
                 @Override
                 public URLConnection getConnection(URL url) throws IOException {
@@ -122,12 +122,11 @@ public class AgentExtensionTest extends
             }, null);
     }
 
-    @SuppressWarnings("unchecked")
     private <T> T locateService(Class<T> iface) {
-        ServiceReference reference = m_bundleContext.getServiceReference(iface.getName());
+        ServiceReference<T> reference = m_bundleContext.getServiceReference(iface);
         if (reference == null) {
             return null;
         }
-        return (T) m_bundleContext.getService(reference);
+        return m_bundleContext.getService(reference);
     }
 }

Modified: ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BaseAgentTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BaseAgentTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BaseAgentTest.java (original)
+++ ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/BaseAgentTest.java Fri Jan 29 08:59:31 2016
@@ -125,7 +125,7 @@ public abstract class BaseAgentTest exte
         // System.out.println("BaseAgentTest: Cleaning bundle data dir (" + dataDir + ")");
         cleanDir(dataDir);
         // System.out.println("BaseAgentTest: Cleaning system properties");
-        Set<String> keysBeRemoved = new HashSet<String>();
+        Set<String> keysBeRemoved = new HashSet<>();
         for (Object key : System.getProperties().keySet()) {
             if (key instanceof String && ((String) key).startsWith(AgentConstants.CONFIG_KEY_NAMESPACE)) {
                 keysBeRemoved.add((String) key);
@@ -139,7 +139,7 @@ public abstract class BaseAgentTest exte
     }
 
     protected void configureAgent(ConfigurationHandler handler, String... configuration) {
-        Map<String, String> config = new HashMap<String, String>();
+        Map<String, String> config = new HashMap<>();
         for (int i = 0; i < configuration.length; i += 2) {
             config.put(configuration[i], configuration[i + 1]);
         }

Modified: ace/trunk/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/Launcher.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/Launcher.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/Launcher.java (original)
+++ ace/trunk/org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/Launcher.java Fri Jan 29 08:59:31 2016
@@ -88,7 +88,7 @@ public class Launcher implements Propert
         addOption(options, 'h', "help", "prints this message");
 
         // Start from scratch...
-        Map<String, String> config = new HashMap<String, String>();
+        Map<String, String> config = new HashMap<>();
 
         CommandLineParser parser = new BasicParser();
         CommandLine command = parser.parse(options, args, false /* stopAtNonOption */);
@@ -213,7 +213,7 @@ public class Launcher implements Propert
 
     private Bundle[] installBundles(BundleContext context, BundleProvider bundleProvider) throws BundleException, IOException {
         URL[] bundles = bundleProvider.getBundles(this);
-        List<Bundle> result = new ArrayList<Bundle>(bundles.length);
+        List<Bundle> result = new ArrayList<>(bundles.length);
         for (URL bundle : bundles) {
             logVerbose("- installing:\t%s%n", bundle.getFile());
 
@@ -246,7 +246,7 @@ public class Launcher implements Propert
     private BundleProvider[] loadBundleProviders() throws Exception {
         ServiceLoader<BundleProvider> bundleFactoryLoader = ServiceLoader.load(BundleProvider.class);
         Iterator<BundleProvider> bundleFactoryIterator = bundleFactoryLoader.iterator();
-        List<BundleProvider> bundleFactoryList = new ArrayList<BundleProvider>();
+        List<BundleProvider> bundleFactoryList = new ArrayList<>();
         while (bundleFactoryIterator.hasNext()) {
             bundleFactoryList.add(bundleFactoryIterator.next());
         }

Modified: ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java (original)
+++ ace/trunk/org.apache.ace.agent.update.itest/src/org/apache/ace/agent/itest/AgentUpdateTest.java Fri Jan 29 08:59:31 2016
@@ -254,7 +254,7 @@ public class AgentUpdateTest extends Int
             "obr.url", obrURL,
             "authentication.enabled", "false");
 
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(AgentConstants.CONFIG_DISCOVERY_SERVERURLS, serverURL);
 
         AgentControl agentControl = getService(AgentControl.class);

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/Activator.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/Activator.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/Activator.java Fri Jan 29 08:59:31 2016
@@ -51,7 +51,7 @@ public class Activator implements Bundle
     // managed state
     private volatile AgentContextImpl m_agentContext;
     private volatile ScheduledExecutorService m_executorService;
-    private volatile ServiceRegistration m_agentControlRegistration;
+    private volatile ServiceRegistration<?> m_agentControlRegistration;
     private volatile DependencyTrackerImpl m_dependencyTracker;
     private volatile Object m_controller;
 

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/AgentContextImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/AgentContextImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/AgentContextImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/AgentContextImpl.java Fri Jan 29 08:59:31 2016
@@ -74,9 +74,9 @@ public class AgentContextImpl implements
         m_workDir = workDir;
 
         m_semaphore = new Semaphore(1);
-        m_handlers = new HashMap<Class<?>, Object>();
-        m_components = new LinkedHashSet<Object>();
-        m_controllerRef = new AtomicReference<Object>();
+        m_handlers = new HashMap<>();
+        m_components = new LinkedHashSet<>();
+        m_controllerRef = new AtomicReference<>();
     }
 
     /**

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ComponentBase.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ComponentBase.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ComponentBase.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ComponentBase.java Fri Jan 29 08:59:31 2016
@@ -45,7 +45,7 @@ public abstract class ComponentBase impl
 
     public ComponentBase(String handlerIdentifier) {
         m_identifier = handlerIdentifier;
-        m_contextRef = new AtomicReference<AgentContext>();
+        m_contextRef = new AtomicReference<>();
     }
 
     @Override

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ConfigurationHandlerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ConfigurationHandlerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ConfigurationHandlerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ConfigurationHandlerImpl.java Fri Jan 29 08:59:31 2016
@@ -53,7 +53,7 @@ public class ConfigurationHandlerImpl ex
     public ConfigurationHandlerImpl(BundleContext context) {
         super("configuration");
         m_context = context;
-        m_configProps = new ConcurrentHashMap<Object, Object>();
+        m_configProps = new ConcurrentHashMap<>();
     }
 
     @Override
@@ -118,7 +118,7 @@ public class ConfigurationHandlerImpl ex
 
     @Override
     public Set<String> keySet() {
-        Set<String> keySet = new HashSet<String>();
+        Set<String> keySet = new HashSet<>();
         for (Object key : m_configProps.keySet()) {
             keySet.add((String) key);
         }
@@ -194,7 +194,7 @@ public class ConfigurationHandlerImpl ex
      *         system properties, never <code>null</code>.
      */
     private Map<String, String> getConfigurationSnapshot() {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
 
         // First copy all agent-related system properties, as they can be overridden by local configuration options...
         Properties sysProps = System.getProperties();

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DefaultController.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DefaultController.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DefaultController.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DefaultController.java Fri Jan 29 08:59:31 2016
@@ -507,7 +507,7 @@ public class DefaultController extends C
     }
 
     protected void sendDeploymentCompletedEvent(UpdateInfo updateInfo, boolean success, Throwable throwable) {
-        Map<String, String> eventProps = new HashMap<String, String>();
+        Map<String, String> eventProps = new HashMap<>();
         eventProps.put("type", updateInfo.m_type);
         eventProps.put("name", getIdentificationHandler().getAgentId());
         eventProps.put("fromVersion", updateInfo.m_from.toString());
@@ -522,7 +522,7 @@ public class DefaultController extends C
     }
 
     protected void sendDeploymentInstallEvent(UpdateInfo updateInfo) {
-        Map<String, String> eventProps = new HashMap<String, String>();
+        Map<String, String> eventProps = new HashMap<>();
         eventProps.put("type", updateInfo.m_type);
         eventProps.put("name", getIdentificationHandler().getAgentId());
         eventProps.put("fromVersion", updateInfo.m_from.toString());

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DependencyTrackerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DependencyTrackerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DependencyTrackerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DependencyTrackerImpl.java Fri Jan 29 08:59:31 2016
@@ -75,8 +75,8 @@ public class DependencyTrackerImpl {
             m_manager = manager;
             m_calback = callback;
 
-            m_tracker = new ServiceDependencyTracker<T>(this, manager.getBundleContext(), FrameworkUtil.createFilter(filterString));
-            m_serviceRef = new AtomicReference<T>();
+            m_tracker = new ServiceDependencyTracker<>(this, manager.getBundleContext(), FrameworkUtil.createFilter(filterString));
+            m_serviceRef = new AtomicReference<>();
         }
 
         public Object getService() {
@@ -120,12 +120,12 @@ public class DependencyTrackerImpl {
      */
     private static class ServiceDependencyTracker<T> extends ServiceTracker<T, T> {
         private final CopyOnWriteArrayList<ServiceReference<T>> m_trackedServiceRefs;
-        private final ServiceDependency m_dependency;
+        private final ServiceDependency<T> m_dependency;
 
-        public ServiceDependencyTracker(ServiceDependency dependency, BundleContext context, Filter filter) {
+        public ServiceDependencyTracker(ServiceDependency<T> dependency, BundleContext context, Filter filter) {
             super(context, filter, null);
             m_dependency = dependency;
-            m_trackedServiceRefs = new CopyOnWriteArrayList<ServiceReference<T>>();
+            m_trackedServiceRefs = new CopyOnWriteArrayList<>();
         }
 
         @Override
@@ -149,8 +149,8 @@ public class DependencyTrackerImpl {
         }
 
         private void checkForUpdate() {
-            ServiceReference highestReference = null;
-            for (ServiceReference reference : m_trackedServiceRefs) {
+            ServiceReference<T> highestReference = null;
+            for (ServiceReference<T> reference : m_trackedServiceRefs) {
                 if (highestReference == null || highestReference.compareTo(reference) < 1) {
                     highestReference = reference;
                 }
@@ -162,7 +162,7 @@ public class DependencyTrackerImpl {
 
     private final BundleContext m_bundleContext;
     private final LifecycleCallback m_callback;
-    private final CopyOnWriteArrayList<ServiceDependency> m_dependencies;
+    private final CopyOnWriteArrayList<ServiceDependency<?>> m_dependencies;
     private final AtomicBoolean m_tracking;
     private final AtomicBoolean m_started;
 
@@ -178,7 +178,7 @@ public class DependencyTrackerImpl {
         m_bundleContext = bundleContext;
         m_callback = callback;
 
-        m_dependencies = new CopyOnWriteArrayList<ServiceDependency>();
+        m_dependencies = new CopyOnWriteArrayList<>();
         m_tracking = new AtomicBoolean(false);
         m_started = new AtomicBoolean(false);
     }
@@ -203,7 +203,7 @@ public class DependencyTrackerImpl {
             filter = String.format("(&%s%s)", filter, extraFilter);
         }
 
-        m_dependencies.addIfAbsent(new ServiceDependency(this, filter, callback));
+        m_dependencies.addIfAbsent(new ServiceDependency<>(this, filter, callback));
     }
 
     public BundleContext getBundleContext() {
@@ -224,7 +224,7 @@ public class DependencyTrackerImpl {
             throw new IllegalStateException("Already started tracking!");
         }
 
-        for (ServiceDependency dependency : m_dependencies) {
+        for (ServiceDependency<?> dependency : m_dependencies) {
             dependency.startTracking();
         }
     }
@@ -242,7 +242,7 @@ public class DependencyTrackerImpl {
             throw new IllegalStateException("Did not start tracking yet");
         }
 
-        for (ServiceDependency dependency : m_dependencies) {
+        for (ServiceDependency<?> dependency : m_dependencies) {
             dependency.stopTracking();
         }
     }
@@ -264,7 +264,7 @@ public class DependencyTrackerImpl {
      * @return <code>true</code> if all dependencies are available, <code>false</code> otherwise.
      */
     final boolean allDependenciesAvailable() {
-        for (ServiceDependency dependency : m_dependencies) {
+        for (ServiceDependency<?> dependency : m_dependencies) {
             if (!dependency.isServiceAvailable()) {
                 return false;
             }

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DeploymentHandlerImpl.java Fri Jan 29 08:59:31 2016
@@ -119,7 +119,7 @@ public class DeploymentHandlerImpl exten
         }
 
         private Map<String, String> getPayload(Event event) {
-            Map<String, String> payload = new HashMap<String, String>();
+            Map<String, String> payload = new HashMap<>();
             for (String propertyName : event.getPropertyNames()) {
                 payload.put(propertyName, event.getProperty(propertyName).toString());
             }

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DiscoveryHandlerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DiscoveryHandlerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DiscoveryHandlerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/DiscoveryHandlerImpl.java Fri Jan 29 08:59:31 2016
@@ -81,7 +81,7 @@ public class DiscoveryHandlerImpl extend
 
     private static final boolean DEFAULT_CHECK_SERVER_URLS = true;
     private static final long DEFAULT_CACHE_MILLISECONDS = 30000;
-    private final Map<String, CheckedURL> m_checkedURLs = new HashMap<String, CheckedURL>();
+    private final Map<String, CheckedURL> m_checkedURLs = new HashMap<>();
 
     private List<String> m_defaultServerURLs;
     private boolean m_defaultCheckURLs;

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventLoggerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventLoggerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventLoggerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventLoggerImpl.java Fri Jan 29 08:59:31 2016
@@ -60,7 +60,7 @@ public class EventLoggerImpl extends Com
 
         m_bundleContext = bundleContext;
         m_isStarted = new AtomicBoolean(false);
-        m_excludeEventList = new HashSet<Integer>();
+        m_excludeEventList = new HashSet<>();
     }
 
     @Override
@@ -96,7 +96,7 @@ public class EventLoggerImpl extends Com
             String excludeEventsString = payload.get(CONFIG_LOGGING_EXCLUDE_EVENTS);
             if (excludeEventsString != null && !"".equals(excludeEventsString.trim())) {
                 logDebug(CONFIG_LOGGING_EXCLUDE_EVENTS + " configuration changed to " + excludeEventsString);
-                Set<Integer> excludeEvents = new HashSet<Integer>();
+                Set<Integer> excludeEvents = new HashSet<>();
                 for(String s:excludeEventsString.trim().split("\\s*,\\s*")) {
                     try {
                         excludeEvents.add(Integer.parseInt(s));
@@ -113,7 +113,7 @@ public class EventLoggerImpl extends Com
         }
         
         int eventType = AuditEvent.DEPLOYMENTADMIN_BASE;
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
 
         if (TOPIC_INSTALL.equals(topic)) {
             String deplPackName = payload.get("deploymentpackage.name");
@@ -141,7 +141,7 @@ public class EventLoggerImpl extends Com
         }
 
         int eventType = AuditEvent.BUNDLE_BASE;
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         Bundle bundle = event.getBundle();
         props.put(AuditEvent.KEY_ID, Long.toString(bundle.getBundleId()));
 
@@ -196,7 +196,7 @@ public class EventLoggerImpl extends Com
             return;
         }
         int eventType = AuditEvent.FRAMEWORK_BASE;
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         Bundle bundle = event.getBundle();
 
         if (bundle != null) {

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventsHandlerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventsHandlerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventsHandlerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/EventsHandlerImpl.java Fri Jan 29 08:59:31 2016
@@ -36,7 +36,7 @@ import org.osgi.util.tracker.ServiceTrac
  * {@link #removeListener(EventListener)}.
  */
 public class EventsHandlerImpl extends ComponentBase implements EventsHandler {
-    private final CopyOnWriteArrayList<EventListener> m_listeners = new CopyOnWriteArrayList<EventListener>();
+    private final CopyOnWriteArrayList<EventListener> m_listeners = new CopyOnWriteArrayList<>();
     private final BundleContext m_bundleContext;
     //
     private volatile ServiceTracker<EventListener, EventListener> m_tracker;
@@ -55,7 +55,7 @@ public class EventsHandlerImpl extends C
     @Override
     public void postEvent(final String topic, Map<String, String> payload) {
         // Make sure that the payload isn't changed while posting events...
-        final Map<String, String> eventPayload = new HashMap<String, String>(payload);
+        final Map<String, String> eventPayload = new HashMap<>(payload);
         for (final EventListener listener : m_listeners) {
             ScheduledExecutorService executor = getExecutorService();
             if (executor.isShutdown()) {
@@ -84,7 +84,7 @@ public class EventsHandlerImpl extends C
     @Override
     public void sendEvent(String topic, Map<String, String> payload) {
         // Make sure that the payload isn't changed while sending events...
-        final Map<String, String> eventPayload = new HashMap<String, String>(payload);
+        final Map<String, String> eventPayload = new HashMap<>(payload);
         for (EventListener listener : m_listeners) {
             try {
                 listener.handle(topic, eventPayload);

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackHandlerImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackHandlerImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackHandlerImpl.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackHandlerImpl.java Fri Jan 29 08:59:31 2016
@@ -38,7 +38,7 @@ import org.apache.ace.agent.FeedbackHand
  */
 public class FeedbackHandlerImpl extends ComponentBase implements FeedbackHandler, EventListener {
     private static Set<String> split(String value) {
-        Set<String> trimmedValues = new HashSet<String>();
+        Set<String> trimmedValues = new HashSet<>();
         if (value != null) {
             String[] rawValues = value.split(",");
             for (String rawValue : rawValues) {
@@ -53,7 +53,7 @@ public class FeedbackHandlerImpl extends
     public FeedbackHandlerImpl() {
         super("feedback");
 
-        m_channels = new ConcurrentHashMap<String, FeedbackChannelImpl>();
+        m_channels = new ConcurrentHashMap<>();
     }
 
     @Override
@@ -71,7 +71,7 @@ public class FeedbackHandlerImpl extends
         if (EVENT_AGENT_CONFIG_CHANGED.equals(topic)) {
             String value = payload.get(CONFIG_FEEDBACK_CHANNELS);
             if (value != null && !"".equals(value.trim())) {
-                Set<String> seen = new HashSet<String>(m_channels.keySet());
+                Set<String> seen = new HashSet<>(m_channels.keySet());
 
                 Set<String> channelNames = split(value);
                 if (channelNames.containsAll(seen) && seen.containsAll(channelNames)) {

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStore.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStore.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStore.java Fri Jan 29 08:59:31 2016
@@ -206,7 +206,7 @@ public class FeedbackStore {
     public List<Record> getRecords(long fromId, long toId) throws IOException {
         RandomAccessFile raf = null;
 
-        List<Record> result = new ArrayList<Record>();
+        List<Record> result = new ArrayList<>();
 
         try {
             // Take a NEW file instance as to ensure we do not

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStoreManager.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStoreManager.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStoreManager.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/FeedbackStoreManager.java Fri Jan 29 08:59:31 2016
@@ -116,8 +116,8 @@ public class FeedbackStoreManager {
             throw new IllegalArgumentException("Need valid dir");
         }
 
-        m_currentStoreRef = new AtomicReference<FeedbackStore>();
-        m_storeFileIdx = new TreeMap<Long, SortedSet<Integer>>();
+        m_currentStoreRef = new AtomicReference<>();
+        m_storeFileIdx = new TreeMap<>();
 
         Pattern p = Pattern.compile(m_name + "-(\\d+).(\\d+)");
         File[] allFiles = m_baseDir.listFiles(m_fileFilter);
@@ -129,7 +129,7 @@ public class FeedbackStoreManager {
 
                 SortedSet<Integer> storeFileNos = m_storeFileIdx.get(storeId);
                 if (storeFileNos == null) {
-                    storeFileNos = new TreeSet<Integer>();
+                    storeFileNos = new TreeSet<>();
                     m_storeFileIdx.put(storeId, storeFileNos);
                 }
                 storeFileNos.add(fileNumber);
@@ -173,7 +173,7 @@ public class FeedbackStoreManager {
      * @return a ordered set of all storeIds, oldest first
      */
     public SortedSet<Long> getAllFeedbackStoreIDs() throws IOException {
-        return new TreeSet<Long>(m_storeFileIdx.keySet());
+        return new TreeSet<>(m_storeFileIdx.keySet());
     }
 
     /**
@@ -194,7 +194,7 @@ public class FeedbackStoreManager {
 
         FeedbackStore[] stores = getAllStores(storeID);
         try {
-            List<Record> records = new ArrayList<Record>();
+            List<Record> records = new ArrayList<>();
             for (FeedbackStore store : stores) {
                 try {
                     if (store.getFirstEventID() <= toEventID && store.getLastEventID() >= fromEventID) {
@@ -209,7 +209,7 @@ public class FeedbackStoreManager {
             // Sort the records by their event ID...
             Collections.sort(records);
             // Unmarshal the records into concrete log events...
-            List<Event> result = new ArrayList<Event>();
+            List<Event> result = new ArrayList<>();
             for (Record record : records) {
                 result.add(new Event(record.m_entry));
             }
@@ -346,7 +346,7 @@ public class FeedbackStoreManager {
      * @return a list of all feedbackstores for this storeId
      */
     private FeedbackStore[] getAllStores(long storeId) throws IOException {
-        List<FeedbackStore> stores = new ArrayList<FeedbackStore>();
+        List<FeedbackStore> stores = new ArrayList<>();
 
         SortedSet<Integer> storeFileNos = m_storeFileIdx.get(storeId);
 
@@ -542,7 +542,7 @@ public class FeedbackStoreManager {
         }
         while (true);
 
-        m_storeFileIdx.put(storeId, new TreeSet<Integer>(Arrays.asList(1)));
+        m_storeFileIdx.put(storeId, new TreeSet<>(Arrays.asList(1)));
 
         return new FeedbackStore(storeFile, storeId);
     }

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ResettableTimer.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ResettableTimer.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ResettableTimer.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/ResettableTimer.java Fri Jan 29 08:59:31 2016
@@ -54,7 +54,7 @@ final class ResettableTimer {
         m_timeout = timeout;
         m_timeUnit = unit;
 
-        m_futureRef = new AtomicReference<ScheduledFuture<?>>();
+        m_futureRef = new AtomicReference<>();
     }
 
     /**

Modified: ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/UpdateHandlerBase.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/UpdateHandlerBase.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/UpdateHandlerBase.java (original)
+++ ace/trunk/org.apache.ace.agent/src/org/apache/ace/agent/impl/UpdateHandlerBase.java Fri Jan 29 08:59:31 2016
@@ -51,7 +51,7 @@ abstract class UpdateHandlerBase extends
     }
 
     protected SortedSet<Version> getAvailableVersions(URL endpoint) throws RetryAfterException, IOException {
-        SortedSet<Version> versions = new TreeSet<Version>();
+        SortedSet<Version> versions = new TreeSet<>();
         URLConnection connection = null;
         BufferedReader reader = null;
         try {

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/ConnectionHandlerImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/ConnectionHandlerImplTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/ConnectionHandlerImplTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/ConnectionHandlerImplTest.java Fri Jan 29 08:59:31 2016
@@ -106,7 +106,7 @@ public class ConnectionHandlerImplTest e
 
     @Test
     public void testBasicAuthFORBIDDEN() throws Exception {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(AgentConstants.CONFIG_CONNECTION_AUTHTYPE, Types.NONE.name());
 
         ConfigurationHandler configurationHandler = m_agentContext.getHandler(ConfigurationHandler.class);
@@ -120,7 +120,7 @@ public class ConnectionHandlerImplTest e
 
     @Test
     public void testBasicAuthOK() throws Exception {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(AgentConstants.CONFIG_CONNECTION_AUTHTYPE, Types.BASIC.name());
         props.put(AgentConstants.CONFIG_CONNECTION_USERNAME, USERNAME);
         props.put(AgentConstants.CONFIG_CONNECTION_PASSWORD, PASSWORD);

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/CustomControllerTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/CustomControllerTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/CustomControllerTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/CustomControllerTest.java Fri Jan 29 08:59:31 2016
@@ -52,7 +52,7 @@ public class CustomControllerTest extend
     Version m_version1 = Version.parseVersion("1.0.0");
     Version m_version2 = Version.parseVersion("2.0.0");
     Version m_version3 = Version.parseVersion("3.0.0");
-    SortedSet<Version> m_availableVersions = new TreeSet<Version>();
+    SortedSet<Version> m_availableVersions = new TreeSet<>();
 
     File m_workDir;
     File m_dummyFile;

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/DeploymentHandlerImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/DeploymentHandlerImplTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/DeploymentHandlerImplTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/DeploymentHandlerImplTest.java Fri Jan 29 08:59:31 2016
@@ -68,7 +68,7 @@ public class DeploymentHandlerImplTest e
     static class TestDeploymentServlet extends HttpServlet {
         private static final long serialVersionUID = 1L;
 
-        private Map<String, File> m_packages = new HashMap<String, File>();
+        private Map<String, File> m_packages = new HashMap<>();
 
         @SuppressWarnings("deprecation")
         @Override
@@ -196,7 +196,7 @@ public class DeploymentHandlerImplTest e
     @Test
     public void testAvailableVersions() throws Exception {
         DeploymentHandler deploymentHandler = m_agentContext.getHandler(DeploymentHandler.class);
-        SortedSet<Version> expected = new TreeSet<Version>();
+        SortedSet<Version> expected = new TreeSet<>();
         expected.add(m_version1);
         expected.add(m_version2);
         expected.add(m_version3);

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/EventLoggerImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/EventLoggerImplTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/EventLoggerImplTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/EventLoggerImplTest.java Fri Jan 29 08:59:31 2016
@@ -65,7 +65,7 @@ public class EventLoggerImplTest extends
 
     static class TestFeedbackHandler implements FeedbackHandler {
 
-        Map<String, FeedbackChannel> channels = new HashMap<String, FeedbackChannel>();
+        Map<String, FeedbackChannel> channels = new HashMap<>();
 
         TestFeedbackHandler() {
             channels.put("auditlog", new TestFeedbackChannel());

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackChannelImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackChannelImplTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackChannelImplTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackChannelImplTest.java Fri Jan 29 08:59:31 2016
@@ -61,7 +61,7 @@ public class FeedbackChannelImplTest ext
     static class TestSendFeedbackServlet extends HttpServlet {
         private static final long serialVersionUID = 1L;
 
-        List<Event> m_events = new ArrayList<Event>();
+        List<Event> m_events = new ArrayList<>();
 
         @Override
         protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreManagerTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreManagerTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreManagerTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreManagerTest.java Fri Jan 29 08:59:31 2016
@@ -113,7 +113,7 @@ public class FeedbackStoreManagerTest ex
         assertEquals(feedbackStoreManager.getHighestEventID(storeID), 0);
         // absolutely exceed the set filesize for this store
         for (int i = 0; i < recordCount; i++) {
-            HashMap<String, String> eventProps = new HashMap<String, String>();
+            HashMap<String, String> eventProps = new HashMap<>();
             eventProps.put("key", "value" + i);
             feedbackStoreManager.write(i, eventProps);
         }

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/impl/FeedbackStoreTest.java Fri Jan 29 08:59:31 2016
@@ -43,7 +43,7 @@ public class FeedbackStoreTest {
         private final CountDownLatch m_start;
         private final CountDownLatch m_stop;
         private final FeedbackStore m_store;
-        private final ConcurrentMap<Long, Boolean> m_seen = new ConcurrentHashMap<Long, Boolean>();
+        private final ConcurrentMap<Long, Boolean> m_seen = new ConcurrentHashMap<>();
         private final int m_count;
 
         public Reader(FeedbackStore store, CountDownLatch start, CountDownLatch stop, int count) {
@@ -104,7 +104,7 @@ public class FeedbackStoreTest {
         private final CountDownLatch m_start;
         private final CountDownLatch m_stop;
         private final FeedbackStore m_store;
-        private final ConcurrentMap<Long, byte[]> m_written = new ConcurrentHashMap<Long, byte[]>();
+        private final ConcurrentMap<Long, byte[]> m_written = new ConcurrentHashMap<>();
         private final int m_count;
         private final int m_initValue;
         private final int m_stepSize;

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/BaseAgentTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/BaseAgentTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/BaseAgentTest.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/BaseAgentTest.java Fri Jan 29 08:59:31 2016
@@ -45,7 +45,7 @@ import org.testng.annotations.AfterClass
  * Simple base class.
  */
 public abstract class BaseAgentTest {
-    private final Set<Object> m_mocks = new HashSet<Object>();
+    private final Set<Object> m_mocks = new HashSet<>();
     private File m_contextDir;
     
     protected <T> T addTestMock(Class<T> clazz) {
@@ -65,7 +65,7 @@ public abstract class BaseAgentTest {
     }
 
     protected void configureAgent(ConfigurationHandler handler, String... configuration) {
-        Map<String, String> config = new HashMap<String, String>();
+        Map<String, String> config = new HashMap<>();
         for (int i = 0; i < configuration.length; i += 2) {
             config.put(configuration[i], configuration[i + 1]);
         }

Modified: ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java (original)
+++ ace/trunk/org.apache.ace.agent/test/org/apache/ace/agent/testutil/TestWebServer.java Fri Jan 29 08:59:31 2016
@@ -86,7 +86,7 @@ public class TestWebServer {
     static class ResponseInfoCollector extends HttpServletResponseWrapper {
         long statusCode;
         String statusMessage = "";
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
 
         public ResponseInfoCollector(HttpServletResponse response) {
             super(response);

Modified: ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java (original)
+++ ace/trunk/org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/LogAuthenticationTest.java Fri Jan 29 08:59:31 2016
@@ -152,7 +152,7 @@ public class LogAuthenticationTest exten
 
     @Override
     protected List<String> getResponse(String request) throws IOException {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         InputStream in = null;
         try {
             in = m_connectionFactory.createConnection(new URL(request)).getInputStream();
@@ -197,7 +197,7 @@ public class LogAuthenticationTest exten
             String tid2 = "47";
 
             // prepare the store
-            List<Event> events = new ArrayList<Event>();
+            List<Event> events = new ArrayList<>();
             events.add(new Event(tid1, 1, 1, 1, 1));
             events.add(new Event(tid2, 1, 1, 1, 1));
             m_serverStore.put(events);

Modified: ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/impl/AuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/impl/AuthenticationServiceImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/impl/AuthenticationServiceImpl.java (original)
+++ ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/impl/AuthenticationServiceImpl.java Fri Jan 29 08:59:31 2016
@@ -40,20 +40,20 @@ public class AuthenticationServiceImpl i
      * Provides a small container for {@link AuthenticationProcessor} instances.
      */
     private static class AuthenticationProcessorHolder implements Comparable<AuthenticationProcessorHolder> {
-        private final ServiceReference m_serviceRef;
+        private final ServiceReference<AuthenticationProcessor> m_serviceRef;
         private final WeakReference<AuthenticationProcessor> m_processor;
 
-        public AuthenticationProcessorHolder(ServiceReference serviceRef, AuthenticationProcessor processor) {
+        public AuthenticationProcessorHolder(ServiceReference<AuthenticationProcessor> serviceRef, AuthenticationProcessor processor) {
             m_serviceRef = serviceRef;
-            m_processor = new WeakReference<AuthenticationProcessor>(processor);
+            m_processor = new WeakReference<>(processor);
         }
 
         /**
          * {@inheritDoc}
          */
         public int compareTo(AuthenticationProcessorHolder other) {
-            ServiceReference thatServiceRef = other.m_serviceRef;
-            ServiceReference thisServiceRef = m_serviceRef;
+            ServiceReference<AuthenticationProcessor> thatServiceRef = other.m_serviceRef;
+            ServiceReference<AuthenticationProcessor> thisServiceRef = m_serviceRef;
             // Sort in reverse order so that the highest rankings come first...
             return thatServiceRef.compareTo(thisServiceRef);
         }
@@ -101,7 +101,7 @@ public class AuthenticationServiceImpl i
      * Creates a new {@link AuthenticationServiceImpl} instance.
      */
     public AuthenticationServiceImpl() {
-        m_processors = new ArrayList<AuthenticationServiceImpl.AuthenticationProcessorHolder>();
+        m_processors = new ArrayList<>();
     }
 
     /**
@@ -109,7 +109,7 @@ public class AuthenticationServiceImpl i
      */
     AuthenticationServiceImpl(LogService log) {
         m_log = log;
-        m_processors = new ArrayList<AuthenticationServiceImpl.AuthenticationProcessorHolder>();
+        m_processors = new ArrayList<>();
     }
 
     /**
@@ -150,14 +150,14 @@ public class AuthenticationServiceImpl i
     final List<AuthenticationProcessor> getProcessors(Object... context) {
         final List<AuthenticationProcessorHolder> processors;
         synchronized (m_processors) {
-            processors = new ArrayList<AuthenticationProcessorHolder>(m_processors);
+            processors = new ArrayList<>(m_processors);
         }
         // Sort on service ranking...
         Collections.sort(processors);
 
         int size = processors.size();
         
-        List<AuthenticationProcessor> result = new ArrayList<AuthenticationProcessor>(size);
+        List<AuthenticationProcessor> result = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
             AuthenticationProcessor authenticationProcessor = processors.get(i).getAuthenticationProcessor();
             // Can be null if it is already GC'd for some reason...
@@ -175,7 +175,7 @@ public class AuthenticationServiceImpl i
      * @param serviceRef the service reference of the authentication processor to add;
      * @param processor the authentication processor to add.
      */
-    protected void addAuthenticationProcessor(ServiceReference serviceRef, AuthenticationProcessor processor) {
+    protected void addAuthenticationProcessor(ServiceReference<AuthenticationProcessor> serviceRef, AuthenticationProcessor processor) {
         synchronized (m_processors) {
             m_processors.add(new AuthenticationProcessorHolder(serviceRef, processor));
         }
@@ -187,7 +187,7 @@ public class AuthenticationServiceImpl i
      * @param serviceRef the service reference of the authentication processor to remove;
      * @param processor the authentication processor to remove.
      */
-    protected void removeAuthenticationProcessor(ServiceReference serviceRef, AuthenticationProcessor processor) {
+    protected void removeAuthenticationProcessor(ServiceReference<AuthenticationProcessor> serviceRef, AuthenticationProcessor processor) {
         synchronized (m_processors) {
             m_processors.remove(new AuthenticationProcessorHolder(serviceRef, processor));
         }

Modified: ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessor.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessor.java (original)
+++ ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessor.java Fri Jan 29 08:59:31 2016
@@ -101,7 +101,7 @@ public class BasicHttpAuthenticationProc
     /**
      * {@inheritDoc}
      */
-    public void updated(Dictionary dictionary) throws ConfigurationException {
+    public void updated(Dictionary<String, ?> dictionary) throws ConfigurationException {
         if (dictionary != null) {
             String keyUsername = (String) dictionary.get(PROPERTY_KEY_USERNAME);
             if (keyUsername == null || "".equals(keyUsername.trim())) {

Modified: ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessor.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessor.java (original)
+++ ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessor.java Fri Jan 29 08:59:31 2016
@@ -140,7 +140,7 @@ public class ClientCertAuthenticationPro
     /**
      * {@inheritDoc}
      */
-    public void updated(Dictionary dictionary) throws ConfigurationException {
+    public void updated(Dictionary<String, ?> dictionary) throws ConfigurationException {
         if (dictionary != null) {
             String usernameLookupKey = (String) dictionary.get(PROPERTY_USERNAME_LOOKUPKEY);
             if (usernameLookupKey == null || "".equals(usernameLookupKey.trim())) {

Modified: ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/password/PasswordAuthenticationProcessor.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/password/PasswordAuthenticationProcessor.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/password/PasswordAuthenticationProcessor.java (original)
+++ ace/trunk/org.apache.ace.authentication/src/org/apache/ace/authentication/processor/password/PasswordAuthenticationProcessor.java Fri Jan 29 08:59:31 2016
@@ -97,7 +97,7 @@ public class PasswordAuthenticationProce
     /**
      * {@inheritDoc}
      */
-    public void updated(Dictionary dictionary) throws ConfigurationException {
+    public void updated(Dictionary<String, ?> dictionary) throws ConfigurationException {
         if (dictionary != null) {
             String keyUsername = (String) dictionary.get(PROPERTY_KEY_USERNAME);
             if (keyUsername == null || "".equals(keyUsername.trim())) {

Modified: ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/impl/AuthenticationServiceImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/impl/AuthenticationServiceImplTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/impl/AuthenticationServiceImplTest.java (original)
+++ ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/impl/AuthenticationServiceImplTest.java Fri Jan 29 08:59:31 2016
@@ -209,7 +209,7 @@ public class AuthenticationServiceImplTe
      * @param authProcessor
      */
     private void registerAuthProcessor(AuthenticationServiceImpl authService, AuthenticationProcessor authProcessor) {
-        ServiceReference sr = mock(ServiceReference.class);
+        ServiceReference<AuthenticationProcessor> sr = mock(ServiceReference.class);
         authService.addAuthenticationProcessor(sr, authProcessor);
     }
 }

Modified: ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessorTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessorTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessorTest.java (original)
+++ ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/basicauth/BasicHttpAuthenticationProcessorTest.java Fri Jan 29 08:59:31 2016
@@ -26,11 +26,11 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.util.Properties;
+import java.util.Dictionary;
+import java.util.Hashtable;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.ace.authentication.processor.basicauth.BasicHttpAuthenticationProcessor;
 import org.apache.commons.codec.binary.Base64;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.useradmin.User;
@@ -181,7 +181,7 @@ public class BasicHttpAuthenticationProc
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptEmptyKeyUsername() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(PROPERTY_KEY_USERNAME, "");
         props.put(PROPERTY_KEY_PASSWORD, "foo");
         
@@ -193,7 +193,7 @@ public class BasicHttpAuthenticationProc
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptMissingKeyUsername() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(PROPERTY_KEY_PASSWORD, "foo");
         
         new BasicHttpAuthenticationProcessor().updated(props);
@@ -204,7 +204,7 @@ public class BasicHttpAuthenticationProc
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptMissingKeyPassword() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(PROPERTY_KEY_USERNAME, "foo");
         
         new BasicHttpAuthenticationProcessor().updated(props);
@@ -215,7 +215,7 @@ public class BasicHttpAuthenticationProc
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptEmptyKeyPassword() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(PROPERTY_KEY_USERNAME, "foo");
         props.put(PROPERTY_KEY_PASSWORD, "");
         
@@ -230,7 +230,7 @@ public class BasicHttpAuthenticationProc
         final String keyUsername = "foo";
         final String keyPassword = "bar";
         
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(PROPERTY_KEY_USERNAME, keyUsername);
         props.put(PROPERTY_KEY_PASSWORD, keyPassword);
         

Modified: ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessorTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessorTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessorTest.java (original)
+++ ace/trunk/org.apache.ace.authentication/test/org/apache/ace/authentication/processor/clientcert/ClientCertAuthenticationProcessorTest.java Fri Jan 29 08:59:31 2016
@@ -33,12 +33,12 @@ import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Properties;
+import java.util.Dictionary;
+import java.util.Hashtable;
 
 import javax.security.auth.x500.X500Principal;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.ace.authentication.processor.clientcert.ClientCertAuthenticationProcessor;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.log.LogService;
 import org.osgi.service.useradmin.User;
@@ -218,7 +218,8 @@ public class ClientCertAuthenticationPro
         final String lookupKey = "anyKey";
         final String matchPolicy = "dn";
 
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, lookupKey);
         props.put(PROPERTY_USERNAME_MATCH_POLICY, matchPolicy);
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "true");
@@ -312,7 +313,8 @@ public class ClientCertAuthenticationPro
         final String lookupKey = "anyKey";
         final String matchPolicy = "cn";
 
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, lookupKey);
         props.put(PROPERTY_USERNAME_MATCH_POLICY, matchPolicy);
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "true");
@@ -342,7 +344,8 @@ public class ClientCertAuthenticationPro
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptEmptyMatchPolicy() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, "foo");
         props.put(PROPERTY_USERNAME_MATCH_POLICY, "");
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "true");
@@ -355,7 +358,8 @@ public class ClientCertAuthenticationPro
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptEmptyLookupKey() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, "");
         props.put(PROPERTY_USERNAME_MATCH_POLICY, "foo");
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "true");
@@ -368,7 +372,8 @@ public class ClientCertAuthenticationPro
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptEmptyVerifyCertValidity() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, "foo");
         props.put(PROPERTY_USERNAME_MATCH_POLICY, "bar");
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "");
@@ -381,7 +386,8 @@ public class ClientCertAuthenticationPro
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptMissingMatchPolicy() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, "foo");
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "true");
 
@@ -393,7 +399,8 @@ public class ClientCertAuthenticationPro
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptMissingUsernameLookupKey() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_MATCH_POLICY, "foo");
         props.put(PROPERTY_VERIFY_CERT_VALIDITY, "true");
 
@@ -405,7 +412,8 @@ public class ClientCertAuthenticationPro
      */
     @Test(groups = { UNIT }, expectedExceptions = ConfigurationException.class)
     public void testUpdatedDoesNotAcceptMissingVerifyCertValidity() throws ConfigurationException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
+
         props.put(PROPERTY_USERNAME_LOOKUPKEY, "foo");
         props.put(PROPERTY_USERNAME_MATCH_POLICY, "foo");
 




Mime
View raw message