Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C84C5200C67 for ; Mon, 15 May 2017 13:03:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C6FF6160BC1; Mon, 15 May 2017 11:03:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 806BF160BE0 for ; Mon, 15 May 2017 13:03:09 +0200 (CEST) Received: (qmail 56775 invoked by uid 500); 15 May 2017 11:03:08 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 55632 invoked by uid 99); 15 May 2017 11:03:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 May 2017 11:03:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BFC2E0061; Mon, 15 May 2017 11:03:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@polygene.apache.org Date: Mon, 15 May 2017 11:03:30 -0000 Message-Id: <8e0846e8eb704e57b256d29a93dbd3bc@git.apache.org> In-Reply-To: <81344bc2677c4f7a8c448c7dc43520ed@git.apache.org> References: <81344bc2677c4f7a8c448c7dc43520ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/50] polygene-java git commit: :libraires:jmx refine archived-at: Mon, 15 May 2017 11:03:13 -0000 :libraires:jmx refine Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/874038f5 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/874038f5 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/874038f5 Branch: refs/heads/develop Commit: 874038f588ff22cd5e015d115c8073056a2f81fa Parents: b77c735 Author: Paul Merlin Authored: Mon May 15 10:50:18 2017 +0200 Committer: Paul Merlin Committed: Mon May 15 10:50:18 2017 +0200 ---------------------------------------------------------------------- .../polygene/library/jmx/ApplicationManagerService.java | 2 -- .../polygene/library/jmx/ConfigurationManagerService.java | 2 -- .../polygene/library/jmx/JMXConnectorConfiguration.java | 3 +-- .../org/apache/polygene/library/jmx/JMXConnectorService.java | 3 +-- .../java/org/apache/polygene/library/jmx/MBeanTracker.java | 6 +++--- .../org/apache/polygene/library/jmx/ModelMBeanBuilder.java | 8 ++++---- 6 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/874038f5/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ApplicationManagerService.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ApplicationManagerService.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ApplicationManagerService.java index 1a11a68..017567d 100644 --- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ApplicationManagerService.java +++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ApplicationManagerService.java @@ -37,7 +37,6 @@ import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ImportedServiceDescriptor; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.service.ServiceDescriptor; import org.apache.polygene.api.service.ServiceReference; import org.apache.polygene.api.structure.Application; @@ -70,7 +69,6 @@ import static org.apache.polygene.api.service.qualifier.ServiceQualifier.withId; @Mixins( ApplicationManagerService.Mixin.class ) @Activators( ApplicationManagerService.Activator.class ) public interface ApplicationManagerService - extends ServiceComposite { void exportApplicationStructure() http://git-wip-us.apache.org/repos/asf/polygene-java/blob/874038f5/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ConfigurationManagerService.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ConfigurationManagerService.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ConfigurationManagerService.java index 58d39f5..50485d1 100644 --- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ConfigurationManagerService.java +++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ConfigurationManagerService.java @@ -64,7 +64,6 @@ import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.property.Property; import org.apache.polygene.api.property.PropertyDescriptor; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.service.ServiceDescriptor; import org.apache.polygene.api.service.ServiceReference; import org.apache.polygene.api.structure.Application; @@ -82,7 +81,6 @@ import org.apache.polygene.spi.PolygeneSPI; @Mixins( ConfigurationManagerService.Mixin.class ) @Activators( ConfigurationManagerService.Activator.class ) public interface ConfigurationManagerService - extends ServiceComposite { void exportConfigurableServices() throws Exception; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/874038f5/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorConfiguration.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorConfiguration.java index f54ce66..c48a221 100644 --- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorConfiguration.java +++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorConfiguration.java @@ -22,7 +22,6 @@ package org.apache.polygene.library.jmx; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.common.UseDefaults; -import org.apache.polygene.api.configuration.ConfigurationComposite; import org.apache.polygene.api.configuration.Enabled; import org.apache.polygene.api.property.Property; @@ -30,7 +29,7 @@ import org.apache.polygene.api.property.Property; * Configuration for JMXConnector. Username+password is optional. */ public interface JMXConnectorConfiguration - extends ConfigurationComposite, Enabled + extends Enabled { // Set this to 1099 as default in assembly @UseDefaults http://git-wip-us.apache.org/repos/asf/polygene-java/blob/874038f5/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorService.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorService.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorService.java index e9cbb33..4d85d82 100644 --- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorService.java +++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/JMXConnectorService.java @@ -55,7 +55,6 @@ import org.slf4j.LoggerFactory; @Mixins(JMXConnectorService.JmxConnectorMixin.class) @Activators( JMXConnectorService.Activator.class ) public interface JMXConnectorService - extends ServiceComposite { void startJMXConnector() @@ -64,7 +63,7 @@ public interface JMXConnectorService void stopJMXConnector() throws Exception; - static class Activator + class Activator extends ActivatorAdapter> { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/874038f5/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/MBeanTracker.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/MBeanTracker.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/MBeanTracker.java index 3cb8ae8..43ffe03 100644 --- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/MBeanTracker.java +++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/MBeanTracker.java @@ -33,7 +33,7 @@ public class MBeanTracker private boolean started = false; private ObjectName pattern; private MBeanServer server; - private List callbacks = new ArrayList(); + private List callbacks = new ArrayList<>(); private List tracked = Collections.synchronizedList( new ArrayList() ); private RegistrationListener registrationListener; @@ -45,7 +45,7 @@ public class MBeanTracker public MBeanTracker registerCallback(TrackerCallback callback) { - List newList = new ArrayList(callbacks); + List newList = new ArrayList<>( callbacks ); newList.add(callback); callbacks = newList; return this; @@ -53,7 +53,7 @@ public class MBeanTracker public MBeanTracker unregisterCallback(TrackerCallback callback) { - List newList = new ArrayList(callbacks); + List newList = new ArrayList<>( callbacks ); newList.remove(callback); callbacks = newList; return this; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/874038f5/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ModelMBeanBuilder.java ---------------------------------------------------------------------- diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ModelMBeanBuilder.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ModelMBeanBuilder.java index cc432a1..fbdcef0 100644 --- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ModelMBeanBuilder.java +++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ModelMBeanBuilder.java @@ -33,10 +33,10 @@ import javax.management.modelmbean.*; */ public class ModelMBeanBuilder { - List attributes = new ArrayList(); - List constructors = new ArrayList(); - List operations = new ArrayList(); - List notifications = new ArrayList(); + List attributes = new ArrayList<>(); + List constructors = new ArrayList<>(); + List operations = new ArrayList<>(); + List notifications = new ArrayList<>(); ObjectName objectName; String displayName;