polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [06/50] [abbrv] polygene-java git commit: :libraires:jmx refine
Date Tue, 16 May 2017 18:50:58 GMT
: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/master
Commit: 874038f588ff22cd5e015d115c8073056a2f81fa
Parents: b77c735
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Mon May 15 10:50:18 2017 +0200
Committer: Paul Merlin <paulmerlin@apache.org>
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<ServiceReference<JMXConnectorService>>
     {
 

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<TrackerCallback> callbacks = new ArrayList<TrackerCallback>();
+    private List<TrackerCallback> callbacks = new ArrayList<>();
     private List<ObjectName> tracked = Collections.synchronizedList( new ArrayList<ObjectName>()
);
     private RegistrationListener registrationListener;
 
@@ -45,7 +45,7 @@ public class MBeanTracker
 
     public MBeanTracker registerCallback(TrackerCallback callback)
     {
-       List<TrackerCallback> newList = new ArrayList<TrackerCallback>(callbacks);
+       List<TrackerCallback> newList = new ArrayList<>( callbacks );
        newList.add(callback);
        callbacks = newList;
        return this;
@@ -53,7 +53,7 @@ public class MBeanTracker
 
     public MBeanTracker unregisterCallback(TrackerCallback callback)
     {
-       List<TrackerCallback> newList = new ArrayList<TrackerCallback>(callbacks);
+       List<TrackerCallback> 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<ModelMBeanAttributeInfo> attributes = new ArrayList<ModelMBeanAttributeInfo>();
-    List<ModelMBeanConstructorInfo> constructors = new ArrayList<ModelMBeanConstructorInfo>();
-    List<ModelMBeanOperationInfo> operations = new ArrayList<ModelMBeanOperationInfo>();
-    List<ModelMBeanNotificationInfo> notifications = new ArrayList<ModelMBeanNotificationInfo>();
+    List<ModelMBeanAttributeInfo> attributes = new ArrayList<>();
+    List<ModelMBeanConstructorInfo> constructors = new ArrayList<>();
+    List<ModelMBeanOperationInfo> operations = new ArrayList<>();
+    List<ModelMBeanNotificationInfo> notifications = new ArrayList<>();
 
     ObjectName objectName;
     String displayName;


Mime
View raw message