aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1824939 - in /aries/trunk/blueprint: blueprint-core/src/main/java/org/apache/aries/blueprint/container/ blueprint-core/src/main/java/org/apache/aries/blueprint/di/ blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/ blue...
Date Wed, 21 Feb 2018 09:03:50 GMT
Author: gnodet
Date: Wed Feb 21 09:03:50 2018
New Revision: 1824939

URL: http://svn.apache.org/viewvc?rev=1824939&view=rev
Log:
[jndi] Remove redundant public/static qualifiers on interfaces

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/DestroyCallback.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/Voidable.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ExecutionContext.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/ScheduledExecutorServiceWrapper.java
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/Discardable.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ComponentDefinitionRegistryProcessor.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Interceptor.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableIdRefMetadata.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableRefMetadata.java
    aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
Wed Feb 21 09:03:50 2018
@@ -528,7 +528,7 @@ public class BlueprintExtender implement
 
     interface ExecutorServiceFinder {
 
-        public ExecutorService find(Bundle bundle);
+        ExecutorService find(Bundle bundle);
 
     }
 

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/DestroyCallback.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/DestroyCallback.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/DestroyCallback.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/DestroyCallback.java
Wed Feb 21 09:03:50 2018
@@ -22,5 +22,7 @@ package org.apache.aries.blueprint.conta
  * A callback to indicate that a destroy operation has completed
  */
 public interface DestroyCallback {
-    public void callback();
+
+    void callback();
+
 }

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/Voidable.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/Voidable.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/Voidable.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/Voidable.java
Wed Feb 21 09:03:50 2018
@@ -17,5 +17,7 @@
 package org.apache.aries.blueprint.container;
 
 public interface Voidable {
-    public void voidReference();
+
+    void voidReference();
+
 }

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ExecutionContext.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ExecutionContext.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ExecutionContext.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/ExecutionContext.java
Wed Feb 21 09:03:50 2018
@@ -23,14 +23,14 @@ import org.osgi.service.blueprint.contai
 
 public interface ExecutionContext {
 
-    public static final class Holder {
+    final class Holder {
 
         private static final ThreadLocal<ExecutionContext> context = new ThreadLocal<ExecutionContext>();
 
         private Holder() {
         }
 
-        public static ExecutionContext getContext() {
+        static ExecutionContext getContext() {
             ExecutionContext executionContext = context.get();
             if (executionContext == null) {
                 throw new IllegalStateException("Execution container has not been set");
@@ -38,7 +38,7 @@ public interface ExecutionContext {
             return executionContext;
         }
 
-        public static ExecutionContext setContext(ExecutionContext newContext) {
+        static ExecutionContext setContext(ExecutionContext newContext) {
             ExecutionContext oldContext = context.get();
             context.set(newContext);
             return oldContext;
@@ -52,13 +52,13 @@ public interface ExecutionContext {
      * @param recipe the recipe to add to the stack
      * @throws CircularDependencyException if the recipe is already on the stack
      */
-    public void push(Recipe recipe) throws CircularDependencyException;
+    void push(Recipe recipe) throws CircularDependencyException;
 
     /**
      * Removes the top recipe from the execution stack.
      * @return the top recipe on the stack
      */
-    public Recipe pop();
+    Recipe pop();
 
     /**
      * Does this context contain a object with the specified name.
@@ -66,7 +66,7 @@ public interface ExecutionContext {
      * @param name the unique name of the object instance
      * @return true if this context contain a object with the specified name
      */
-    public boolean containsObject(String name);
+    boolean containsObject(String name);
 
     /**
      * Gets the object or recipe with the specified name from the repository.
@@ -74,7 +74,7 @@ public interface ExecutionContext {
      * @param name the unique name of the object instance
      * @return the object instance, a recipe to build the object or null
      */
-    public Object getObject(String name);
+    Object getObject(String name);
 
     /**
      * Try to add a full object and return the already registered future if available
@@ -82,21 +82,21 @@ public interface ExecutionContext {
      * @param object
      * @return
      */
-    public Future<Object> addFullObject(String name, Future<Object> object);
+    Future<Object> addFullObject(String name, Future<Object> object);
     
-    public void addPartialObject(String name, Object object);
+    void addPartialObject(String name, Object object);
     
-    public Object getPartialObject(String name);
+    Object getPartialObject(String name);
     
-    public void removePartialObject(String name);
+    void removePartialObject(String name);
 
-    public Object convert(Object value, ReifiedType type) throws Exception;
+    Object convert(Object value, ReifiedType type) throws Exception;
     
-    public boolean canConvert(Object value, ReifiedType type);
+    boolean canConvert(Object value, ReifiedType type);
 
-    public Class loadClass(String className) throws ClassNotFoundException;
+    Class loadClass(String className) throws ClassNotFoundException;
 
-    public Recipe getRecipe(String name);
+    Recipe getRecipe(String name);
     
 }
 

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/evaluator/PropertyEvaluator.java
Wed Feb 21 09:03:50 2018
@@ -20,5 +20,7 @@ import java.util.Dictionary;
 
 @Deprecated
 public interface PropertyEvaluator {
-    public String evaluate(String expression, Dictionary<String, String> properties);
+
+    String evaluate(String expression, Dictionary<String, String> properties);
+
 }

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/ScheduledExecutorServiceWrapper.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/ScheduledExecutorServiceWrapper.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/ScheduledExecutorServiceWrapper.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/ScheduledExecutorServiceWrapper.java
Wed Feb 21 09:03:50 2018
@@ -58,8 +58,11 @@ import org.osgi.framework.InvalidSyntaxE
  * </p>
  */
 public class ScheduledExecutorServiceWrapper implements ScheduledExecutorService, SingleServiceListener
{
-    public static interface ScheduledExecutorServiceFactory {
-        public ScheduledExecutorService create(String name);
+
+    public interface ScheduledExecutorServiceFactory {
+
+        ScheduledExecutorService create(String name);
+
     }
 
     private final AtomicReference<ScheduledExecutorService> _current = new AtomicReference<ScheduledExecutorService>();

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/Discardable.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/Discardable.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/Discardable.java
(original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/threading/impl/Discardable.java
Wed Feb 21 09:03:50 2018
@@ -19,5 +19,7 @@
 package org.apache.aries.blueprint.utils.threading.impl;
 
 public interface Discardable<T> {
-    public <T> T discard();
+
+    <T> T discard();
+
 }
\ No newline at end of file

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ComponentDefinitionRegistryProcessor.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ComponentDefinitionRegistryProcessor.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ComponentDefinitionRegistryProcessor.java
(original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ComponentDefinitionRegistryProcessor.java
Wed Feb 21 09:03:50 2018
@@ -43,6 +43,6 @@ public interface ComponentDefinitionRegi
      * Process a <code>ComponentDefinitionRegistry</code>
      * @param registry 
      */
-    public void process(ComponentDefinitionRegistry registry);
+    void process(ComponentDefinitionRegistry registry);
 
 }

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java
(original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/ExtendedReferenceMetadata.java
Wed Feb 21 09:03:50 2018
@@ -24,22 +24,22 @@ import org.osgi.service.blueprint.reflec
 
 public interface ExtendedReferenceMetadata extends ReferenceMetadata, ExtendedServiceReferenceMetadata
 {
-    public int DAMPING_RELUCTANT = 0;
+    int DAMPING_RELUCTANT = 0;
 
-    public int DAMPING_GREEDY = 1;
+    int DAMPING_GREEDY = 1;
 
-    public int LIFECYCLE_DYNAMIC = 0;
+    int LIFECYCLE_DYNAMIC = 0;
 
-    public int LIFECYCLE_STATIC = 1;
+    int LIFECYCLE_STATIC = 1;
 
-    public String getDefaultBean();
+    String getDefaultBean();
     
-    public Collection<Class<?>> getProxyChildBeanClasses();
+    Collection<Class<?>> getProxyChildBeanClasses();
     
-    public Collection<String> getExtraInterfaces();
+    Collection<String> getExtraInterfaces();
 
-    public int getDamping();
+    int getDamping();
 
-    public int getLifecycle();
+    int getLifecycle();
 
 }
\ No newline at end of file

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Interceptor.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Interceptor.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Interceptor.java
(original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/Interceptor.java
Wed Feb 21 09:03:50 2018
@@ -34,7 +34,7 @@ public interface Interceptor {
      * @return token which will subsequently be passed to postCall
      * @throws Throwable
      */
-    public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable;
+    Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable;
     
     /**
      * This method is called after the method m is invoked and returned normally.
@@ -44,7 +44,7 @@ public interface Interceptor {
      * @param preCallToken token returned by preCall
      * @throws Throwable
      */
-    public void postCallWithReturn(ComponentMetadata cm, Method m, Object returnType, Object
preCallToken) throws Throwable;
+    void postCallWithReturn(ComponentMetadata cm, Method m, Object returnType, Object preCallToken)
throws Throwable;
     
     /**
      * The method is called after the method m is invoked and causes an exception.
@@ -54,7 +54,7 @@ public interface Interceptor {
      * @param preCallToken token returned by preCall
      * @throws Throwable
      */
-    public void postCallWithException(ComponentMetadata cm, Method m, Throwable ex, Object
preCallToken) throws Throwable;
+    void postCallWithException(ComponentMetadata cm, Method m, Throwable ex, Object preCallToken)
throws Throwable;
     
     
     /**
@@ -64,5 +64,5 @@ public interface Interceptor {
      * all others (except of the same rank).
      * @return the rank of the interceptor
      */
-    public int getRank();
+    int getRank();
 }

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableIdRefMetadata.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableIdRefMetadata.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableIdRefMetadata.java
(original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableIdRefMetadata.java
Wed Feb 21 09:03:50 2018
@@ -27,6 +27,6 @@ import org.osgi.service.blueprint.reflec
  */
 public interface MutableIdRefMetadata extends IdRefMetadata {
 
-    public void setComponentId(String componentId);
+    void setComponentId(String componentId);
 
 }

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableRefMetadata.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableRefMetadata.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableRefMetadata.java
(original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/mutable/MutableRefMetadata.java
Wed Feb 21 09:03:50 2018
@@ -27,6 +27,6 @@ import org.osgi.service.blueprint.reflec
  */
 public interface MutableRefMetadata extends RefMetadata {
 
-    public void setComponentId(String componentId);
+    void setComponentId(String componentId);
 
 }

Modified: aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java?rev=1824939&r1=1824938&r2=1824939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java
(original)
+++ aries/trunk/blueprint/blueprint-parser/src/main/java/org/apache/aries/blueprint/parser/NamespaceHandlerSet.java
Wed Feb 21 09:03:50 2018
@@ -83,7 +83,7 @@ public interface NamespaceHandlerSet {
      * @see NamespaceHandlerSet#addListener(org.apache.aries.blueprint.container.NamespaceHandlerRegistry.Listener)
      * @see NamespaceHandlerSet#removeListener(org.apache.aries.blueprint.container.NamespaceHandlerRegistry.Listener)

      */
-    public interface Listener {
+    interface Listener {
 
         /**
          * Called when a NamespaceHandler has been registered for the specified URI.



Mime
View raw message