You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/03/26 19:33:21 UTC
(aries) 01/01: [MAINTENANCE] Cleanup simple pmd findings in application
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch cleanup-simple-pmd-findings-in-application
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 9be20ceb510c28354f4085befc5b868494412aec
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Wed Mar 26 20:33:04 2025 +0100
[MAINTENANCE] Cleanup simple pmd findings in application
---
.../aries/application/ApplicationMetadata.java | 57 +++++++------
.../application/ApplicationMetadataFactory.java | 7 +-
.../java/org/apache/aries/application/Content.java | 17 ++--
.../aries/application/DeploymentContent.java | 2 +-
.../aries/application/DeploymentMetadata.java | 22 ++---
.../application/DeploymentMetadataFactory.java | 12 +--
.../aries/application/ServiceDeclaration.java | 4 +-
.../application/management/AriesApplication.java | 15 ++--
.../management/AriesApplicationContext.java | 54 ++++++------
.../management/AriesApplicationListener.java | 3 +-
.../management/AriesApplicationManager.java | 17 ++--
.../aries/application/management/BundleInfo.java | 24 +++---
.../application/management/ResolveConstraint.java | 5 +-
.../management/spi/convert/BundleConversion.java | 5 +-
.../management/spi/convert/BundleConverter.java | 2 +-
.../management/spi/framework/BundleFramework.java | 22 ++---
.../framework/BundleFrameworkConfiguration.java | 7 +-
.../BundleFrameworkConfigurationFactory.java | 5 +-
.../spi/framework/BundleFrameworkFactory.java | 3 +-
.../spi/framework/BundleFrameworkManager.java | 23 +++---
.../spi/repository/BundleRepository.java | 20 ++---
.../spi/repository/BundleRepositoryManager.java | 11 ++-
.../spi/resolve/DeploymentManifestManager.java | 1 -
.../spi/resolve/PostResolveTransformer.java | 3 +-
.../management/spi/resolve/PreResolveHook.java | 2 +-
.../runtime/AriesApplicationContextManager.java | 8 +-
.../management/spi/runtime/LocalPlatform.java | 4 +-
.../management/spi/update/UpdateStrategy.java | 24 +++---
.../application/modelling/DeploymentMFElement.java | 5 +-
.../application/modelling/ExportedPackage.java | 3 +-
.../application/modelling/ExportedService.java | 4 +-
.../application/modelling/ImportedBundle.java | 3 +-
.../application/modelling/ImportedPackage.java | 3 +-
.../application/modelling/ImportedService.java | 3 +-
.../application/modelling/ModelledResource.java | 7 +-
.../modelling/ModelledResourceManager.java | 3 +-
.../application/modelling/ModellingConstants.java | 21 +++--
.../modelling/ParsedServiceElements.java | 19 ++---
.../aries/application/modelling/ParserProxy.java | 8 +-
.../aries/application/modelling/Provider.java | 3 +-
.../aries/application/modelling/ResourceType.java | 3 -
.../application/modelling/ServiceModeller.java | 3 +-
.../modelling/WrappedReferenceMetadata.java | 5 +-
.../impl/DeploymentManifestManagerImpl.java | 11 ++-
.../deployment/management/impl/MessageUtil.java | 10 +--
.../java/org/apache/aries/sample/HelloWorld.java | 3 +-
.../runtime/itests/OBRResolverAdvancedTest.java | 2 +-
.../management/impl/AriesApplicationImpl.java | 2 -
.../impl/AriesApplicationManagerImpl.java | 4 +-
.../repository/ApplicationRepository.java | 2 +-
.../impl/AriesApplicationManagerImplTest.java | 2 +-
.../standalone/OfflineModellingFactory.java | 2 +-
.../modelling/impl/AbstractParserProxy.java | 4 +-
.../modelling/impl/DeployedBundlesImpl.java | 4 +-
.../modelling/impl/ImportedBundleImpl.java | 9 +-
.../modelling/impl/ImportedPackageImpl.java | 3 +-
.../modelling/impl/ImportedServiceImpl.java | 10 +--
.../impl/ModelledResourceManagerImpl.java | 6 +-
.../modelling/internal/BundleBlueprintParser.java | 6 +-
.../modelling/utils/impl/ModellingHelperImpl.java | 18 ++--
.../application/resolver/obr/OBRAriesResolver.java | 14 ++--
.../resolver/obr/impl/ApplicationResourceImpl.java | 6 +-
.../resolver/obr/impl/OBRBundleInfo.java | 3 +-
.../resolver/obr/impl/OBRCapability.java | 4 +-
.../resolver/obr/impl/RepositoryGeneratorImpl.java | 6 +-
.../resolver/obr/impl/RequirementImpl.java | 2 +-
.../ConfigurationPostResolveTransformerImpl.java | 8 +-
.../management/BundleFrameworkManagerImpl.java | 20 ++---
.../management/SharedFrameworkPreResolveHook.java | 2 +-
.../runtime/framework/BundleFrameworkImpl.java | 2 +-
.../framework/utils/EquinoxFrameworkConstants.java | 12 ++-
.../framework/utils/EquinoxFrameworkUtils.java | 4 +-
.../impl/ApplicationContextManagerImpl.java | 95 +++++++++++-----------
.../repository/BundleRepositoryManagerImpl.java | 2 +-
.../generator/AriesRepositoryGenerator.java | 10 +--
.../impl/ApplicationMetadataFactoryImpl.java | 1 -
.../application/impl/ApplicationMetadataImpl.java | 2 +-
.../apache/aries/application/impl/ContentImpl.java | 2 +-
.../application/impl/DeploymentMetadataImpl.java | 16 ++--
.../aries/application/utils/AppConstants.java | 62 +++++++-------
.../utils/management/SimpleBundleInfo.java | 1 -
.../utils/service/ExportedServiceHelper.java | 3 -
.../utils/service/ServiceCollection.java | 6 +-
.../aries/unittest/fixture/ArchiveFixture.java | 2 +-
.../apache/aries/unittest/mocks/MethodCall.java | 4 +-
.../org/apache/aries/unittest/mocks/Skeleton.java | 4 +-
86 files changed, 391 insertions(+), 472 deletions(-)
diff --git a/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java b/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java
index 0550f5bf6..071cc600c 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadata.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.application;
+package org.apache.aries.application;
import java.io.File;
import java.io.IOException;
@@ -27,71 +27,70 @@ import java.util.List;
import org.osgi.framework.Version;
/**
- * A representation of an APPLICATION.MF file.
+ * A representation of an APPLICATION.MF file.
*
*/
-public interface ApplicationMetadata
-{
+public interface ApplicationMetadata {
/**
* get the value of the Application-SymbolicName header
* @return the value of the Application-SymbolicName header
*/
- public String getApplicationSymbolicName();
-
+ String getApplicationSymbolicName();
+
/**
* get the value of the Application-Version header
* @return the value of the Application-Version header
*/
- public Version getApplicationVersion();
-
+ Version getApplicationVersion();
+
/**
* get the name of the application
* @return the name of the application
*/
- public String getApplicationName();
+ String getApplicationName();
/**
- * get the list of Application contents includes bundle name,
+ * get the list of Application contents includes bundle name,
* version, directives and attributes
- * @return the list of the Application contents
+ * @return the list of the Application contents
*/
- public List<Content> getApplicationContents();
-
+ List<Content> getApplicationContents();
+
/**
* get the value of the Export-Service header
* @return the list of ServiceDeclaration
*/
- public List<ServiceDeclaration> getApplicationExportServices();
-
+ List<ServiceDeclaration> getApplicationExportServices();
+
/**
* get the value of the Import-Service header
* @return the list of ServiceDeclaration
*/
- public List<ServiceDeclaration> getApplicationImportServices();
-
+ List<ServiceDeclaration> getApplicationImportServices();
+
/**
- * get the value of the Application-Scope, which is
+ * get the value of the Application-Scope, which is
* calculated from Application-SymbolicName and Application-Version
* @return the value of the AppScope
*/
- public String getApplicationScope();
-
+ String getApplicationScope();
+
/**
* get the list of use-bundle content including bundle symbolic name and version range
* @return the collection of use bundles.
*/
- public Collection<Content> getUseBundles();
-
- /**
- * Persist this metadata.
+ Collection<Content> getUseBundles();
+
+ /**
+ * Persist this metadata.
* @param f The file to store this metadata to
* @throws IOException
*/
- public void store(File f) throws IOException;
-
- /**
- * Persist this metadata.
+ void store(File f) throws IOException;
+
+ /**
+ * Persist this metadata.
* @param out The output stream to store this metadata to
* @throws IOException
*/
- public void store(OutputStream out) throws IOException;
+ void store(OutputStream out) throws IOException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java b/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java
index fcc35874f..6a8ee841c 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/ApplicationMetadataFactory.java
@@ -26,8 +26,7 @@ import java.util.jar.Manifest;
* Provides various means of generating {@link org.apache.aries.application.ApplicationMetadata
* ApplicationMetadata} instances.
*/
-public interface ApplicationMetadataFactory
-{
+public interface ApplicationMetadataFactory {
/**
* Parse from the input stream the application manifest. This method is more
@@ -38,7 +37,7 @@ public interface ApplicationMetadataFactory
* @return the parsed application metadata.
*
*/
- public ApplicationMetadata parseApplicationMetadata(InputStream in) throws IOException;
+ ApplicationMetadata parseApplicationMetadata(InputStream in) throws IOException;
/**
* Create the application metadata from the provided Manifest. This is provided
@@ -48,6 +47,6 @@ public interface ApplicationMetadataFactory
* @param man the manifest to read from
* @return the parsed application metadata.
*/
- public ApplicationMetadata createApplicationMetadata(Manifest man);
+ ApplicationMetadata createApplicationMetadata(Manifest man);
}
\ No newline at end of file
diff --git a/application/application-api/src/main/java/org/apache/aries/application/Content.java b/application/application-api/src/main/java/org/apache/aries/application/Content.java
index 2cfe5c508..374029ccf 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/Content.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/Content.java
@@ -27,49 +27,48 @@ import org.apache.aries.util.VersionRange;
* A representation of content metadata such as Application-Content, Import-Package, etc
*
*/
-public interface Content
-{
+public interface Content {
/**
* get the content name of the content
* @return the content name of the content
*/
- public String getContentName();
+ String getContentName();
/**
* get the attributes of the content
* @return the attributes of the content
*/
- public Map<String, String> getAttributes();
+ Map<String, String> getAttributes();
/**
* get the directives of the content
* @return the directives of the content
*/
- public Map<String, String> getDirectives();
+ Map<String, String> getDirectives();
/**
* get the value of the attribute with the specified key
* @param key
* @return value of the attribute specified by the key
*/
- public String getAttribute(String key);
+ String getAttribute(String key);
/**
* get the value of the directive with the specified key
* @param key
* @return the value of the directive specified by the key
*/
- public String getDirective(String key);
+ String getDirective(String key);
/**
* get the version info for the version attribute
* @return null if there is no version associated with this content
*/
- public VersionRange getVersion();
+ VersionRange getVersion();
/**
* get the attribute and directive info in NameValueMap
* @return namevalueMap that contains attribute and directive info
*/
- public Map<String, String> getNameValueMap();
+ Map<String, String> getNameValueMap();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java b/application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java
index 4823ef791..b06a6d0ba 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/DeploymentContent.java
@@ -31,6 +31,6 @@ public interface DeploymentContent extends Content {
* this cannot be null
* @return the exact version
*/
- public Version getExactVersion();
+ Version getExactVersion();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java b/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
index 7c900eed9..18dfa90d2 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
@@ -39,63 +39,63 @@ public interface DeploymentMetadata {
* get the value of the Application-SymbolicName header
* @return the value of the Application-SymbolicName header
*/
- public String getApplicationSymbolicName();
+ String getApplicationSymbolicName();
/**
* get the value of the Application-Version header
* @return the value of the Application-Version header
*/
- public Version getApplicationVersion();
+ Version getApplicationVersion();
/**
* get the value of the Deployed-Content header
* @return the list of the deployed content
*/
- public List<DeploymentContent> getApplicationDeploymentContents();
+ List<DeploymentContent> getApplicationDeploymentContents();
/**
* get the value of the Provision-Bundle header
* @return the list of non-app bundles to provision.
*/
- public List<DeploymentContent> getApplicationProvisionBundles();
+ List<DeploymentContent> getApplicationProvisionBundles();
/**
* get the value of Deployed-UseBundle header
*
* @return the list of bundles to use from the deployment.
*/
- public Collection<DeploymentContent> getDeployedUseBundle();
+ Collection<DeploymentContent> getDeployedUseBundle();
/**
* get the value of Import-Package
* @return all the packages to import from non-app content.
*/
- public Collection<Content> getImportPackage();
+ Collection<Content> getImportPackage();
/**
* Get the list of DeployedService-Import
* @return DeployedService-Import
*/
- public Collection<Filter> getDeployedServiceImport();
+ Collection<Filter> getDeployedServiceImport();
/**
* get the contents of deployment manifest in a map
* @return the required feature map
*/
- public Map<String, String> getHeaders();
+ Map<String, String> getHeaders();
/**
* Obtain the associated
* {@link org.apache.aries.application.ApplicationMetadata ApplicationMetadata}.
* @return The application metadata.
*/
- public ApplicationMetadata getApplicationMetadata();
+ ApplicationMetadata getApplicationMetadata();
/**
* Persist this metadata as Manifest-formatted text.
* @param f The file to store this metadata to
* @throws IOException
*/
- public void store(File f) throws IOException;
+ void store(File f) throws IOException;
/**
* Persist this metadata.
@@ -103,6 +103,6 @@ public interface DeploymentMetadata {
* @throws IOException
*/
- public void store(OutputStream out) throws IOException;
+ void store(OutputStream out) throws IOException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java b/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
index 8f9acc33c..ba3b6a30e 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadataFactory.java
@@ -43,7 +43,7 @@ public interface DeploymentMetadataFactory {
* @return DeploymentMetadata instance
*/
@Deprecated
- public DeploymentMetadata createDeploymentMetadata (AriesApplication app, Set<BundleInfo> bundleInfo)
+ DeploymentMetadata createDeploymentMetadata (AriesApplication app, Set<BundleInfo> bundleInfo)
throws ResolverException;
/**
@@ -54,7 +54,7 @@ public interface DeploymentMetadataFactory {
* @return DeploymentMetadata instance
*/
@Deprecated
- public DeploymentMetadata createDeploymentMetadata (IFile src) throws IOException;
+ DeploymentMetadata createDeploymentMetadata (IFile src) throws IOException;
/**
@@ -64,7 +64,7 @@ public interface DeploymentMetadataFactory {
* @throws IOException
* @return DeploymentMetadata instance
*/
- public DeploymentMetadata parseDeploymentMetadata (IFile src) throws IOException;
+ DeploymentMetadata parseDeploymentMetadata (IFile src) throws IOException;
/**
* Deprecated. Use parseDeploymentMetadata.
@@ -74,7 +74,7 @@ public interface DeploymentMetadataFactory {
* @return DeploymentMetadata instance
*/
@Deprecated
- public DeploymentMetadata createDeploymentMetadata (InputStream in) throws IOException;
+ DeploymentMetadata createDeploymentMetadata (InputStream in) throws IOException;
/**
* Extract a DeploymentMetadata instance from InputStream.
@@ -83,7 +83,7 @@ public interface DeploymentMetadataFactory {
* @throws IOException
* @return DeploymentMetadata instance
*/
- public DeploymentMetadata parseDeploymentMetadata (InputStream in) throws IOException;
+ DeploymentMetadata parseDeploymentMetadata (InputStream in) throws IOException;
/**
* Extract a DeploymentMetadata instance from Manifest.
@@ -92,6 +92,6 @@ public interface DeploymentMetadataFactory {
* @throws IOException
* @return DeploymentMetadata instance
*/
- public DeploymentMetadata createDeploymentMetadata (Manifest manifest) throws IOException;
+ DeploymentMetadata createDeploymentMetadata (Manifest manifest) throws IOException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java b/application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java
index 66ff08071..2b3a07ac4 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/ServiceDeclaration.java
@@ -29,12 +29,12 @@ public interface ServiceDeclaration {
* get the interface name for the service
* @return The name of the service's interface class.
*/
- public abstract String getInterfaceName();
+ String getInterfaceName();
/**
* get the filter for the service
* @return the filter for the service or null if there is no filter defined
*/
- public abstract Filter getFilter();
+ Filter getFilter();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java
index 7661bba3b..877481aa7 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplication.java
@@ -33,24 +33,23 @@ import org.apache.aries.application.DeploymentMetadata;
* Metadata about an Aries application
*
*/
-public interface AriesApplication
-{
+public interface AriesApplication {
/**
* Get the application metadata, which is stored in META-INF/APPLICATION.MF.
* @return ApplicationMetadata
*/
- public ApplicationMetadata getApplicationMetadata();
+ ApplicationMetadata getApplicationMetadata();
/**
* Get the deployment metadata, which is stored in META-INF/DEPLOYMENT.MF.
* @return DeploymentMetadata
*/
- public DeploymentMetadata getDeploymentMetadata();
+ DeploymentMetadata getDeploymentMetadata();
/**
* @return the set of bundles included in the application by value
*/
- public Set<BundleInfo> getBundleInfo();
+ Set<BundleInfo> getBundleInfo();
/**
@@ -63,19 +62,19 @@ public interface AriesApplication
* @see org.apache.aries.application.management.AriesApplicationManager#install(AriesApplication)
* @see org.apache.aries.application.management.AriesApplicationManager#resolve(AriesApplication, ResolveConstraint...)
*/
- public boolean isResolved();
+ boolean isResolved();
/**
* Persist this metadata.
* @param f The file to store this metadata to
* @throws IOException
*/
- public void store(File f) throws FileNotFoundException, IOException;
+ void store(File f) throws FileNotFoundException, IOException;
/**
* Persist this metadata.
* @param out The output stream to store this metadata to
* @throws IOException
*/
- public void store(OutputStream out) throws FileNotFoundException, IOException;
+ void store(OutputStream out) throws FileNotFoundException, IOException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
index 153b39da9..a681c10b4 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
@@ -25,47 +25,45 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
/**
- * Represents an Aries application in the runtime. See the application-runtime module for a
- * sample implementation.
+ * Represents an Aries application in the runtime. See the application-runtime module for a
+ * sample implementation.
*/
-public interface AriesApplicationContext
-{
- /**
- * Get the state of a running application. An application is INSTALLED if all its bundles
- * are installed, RESOLVED if all its bundles are resolved, ACTIVE if all its bundles are
- * active, and so on.
- * @return ApplicationState.
+public interface AriesApplicationContext {
+ /**
+ * Get the state of a running application. An application is INSTALLED if all its bundles
+ * are installed, RESOLVED if all its bundles are resolved, ACTIVE if all its bundles are
+ * active, and so on.
+ * @return ApplicationState.
*/
- public ApplicationState getApplicationState();
-
+ ApplicationState getApplicationState();
+
/**
- * Obtain the associated AriesApplication metadata.
+ * Obtain the associated AriesApplication metadata.
* @return AriesApplication
*/
- public AriesApplication getApplication();
-
+ AriesApplication getApplication();
+
/**
- * Start the application by starting all its constituent bundles as per the DeploymentContent
- * in the associated AriesApplication's DeploymentMetadata.
+ * Start the application by starting all its constituent bundles as per the DeploymentContent
+ * in the associated AriesApplication's DeploymentMetadata.
* @throws BundleException
*/
- public void start() throws BundleException, IllegalStateException;
-
+ void start() throws BundleException, IllegalStateException;
+
/**
- * Stop the application by stopping all its constituent bundles.
+ * Stop the application by stopping all its constituent bundles.
* @throws BundleException
*/
- public void stop() throws BundleException, IllegalStateException;
-
+ void stop() throws BundleException, IllegalStateException;
+
/**
* Get the org.osgi.framework.Bundle objects representing the application's runtime
- * constituents.
- * @return The application's runtime content.
+ * constituents.
+ * @return The application's runtime content.
*/
- public Set<Bundle> getApplicationContent();
-
- public enum ApplicationState
- {
- INSTALLED, RESOLVED, STARTING, STOPPING, ACTIVE, UNINSTALLED
+ Set<Bundle> getApplicationContent();
+
+ enum ApplicationState {
+ INSTALLED, RESOLVED, STARTING, STOPPING, ACTIVE, UNINSTALLED
}
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
index a1ab7da33..f2acd5886 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management;
/**
@@ -27,5 +26,5 @@ public interface AriesApplicationListener {
/**
* Receives notification of an application lifecycle event
*/
- public void applicationChanged (AriesApplicationEvent event);
+ void applicationChanged (AriesApplicationEvent event);
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java
index 180a356e9..8e301a8e6 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationManager.java
@@ -30,8 +30,7 @@ import org.osgi.framework.BundleException;
* An AriesApplicationManager service is used to create, install and uninstall Aries
* applications.
*/
-public interface AriesApplicationManager
-{
+public interface AriesApplicationManager {
/**
* Create an AriesApplication from a local resource.
* The application won't be automatically resolved if the
@@ -41,7 +40,7 @@ public interface AriesApplicationManager
* @return AriesApplication
* @throws ManagementException
*/
- public AriesApplication createApplication(IDirectory source) throws ManagementException;
+ AriesApplication createApplication(IDirectory source) throws ManagementException;
/**
* Create an AriesApplication from a remote resource.
@@ -52,7 +51,7 @@ public interface AriesApplicationManager
* @return the application.
* @throws ManagementException
*/
- public AriesApplication createApplication(URL url) throws ManagementException;
+ AriesApplication createApplication(URL url) throws ManagementException;
/**
* Install an AriesApplication - i.e. load its bundles into the runtime, but do
@@ -67,26 +66,26 @@ public interface AriesApplicationManager
* @throws BundleException
* @throws ManagementException
*/
- public AriesApplicationContext install(AriesApplication app) throws BundleException, ManagementException, ResolverException;
+ AriesApplicationContext install(AriesApplication app) throws BundleException, ManagementException, ResolverException;
/**
* Uninstall an AriesApplication - i.e. unload its bundles from the runtime.
* @param app The installed application to uninstall
* @throws BundleException
*/
- public void uninstall(AriesApplicationContext app) throws BundleException;
+ void uninstall(AriesApplicationContext app) throws BundleException;
/**
* Add an AriesApplicationListener
* @param l
*/
- public void addApplicationListener(AriesApplicationListener l);
+ void addApplicationListener(AriesApplicationListener l);
/**
* Remove an AriesApplicationListener
* @param l
*/
- public void removeApplicationListener(AriesApplicationListener l);
+ void removeApplicationListener(AriesApplicationListener l);
/**
* Update an application's deployment and apply the changes to the runtime if the application is deployed
@@ -99,7 +98,7 @@ public interface AriesApplicationManager
* @throws IllegalArgumentException if the deployment metadata does not correspond to the same application
* (same symbolic name and same version)
*/
- public AriesApplicationContext update(AriesApplication app, DeploymentMetadata depMf) throws UpdateException;
+ AriesApplicationContext update(AriesApplication app, DeploymentMetadata depMf) throws UpdateException;
/**
* Resolve an AriesApplication against a set of constraints. Each ResolveConstraint
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java b/application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java
index 5ca0aada5..7ac5cec30 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/BundleInfo.java
@@ -32,38 +32,38 @@ import org.apache.aries.application.Content;
public interface BundleInfo
{
/** Bundle-SymbolicName */
- public String getSymbolicName();
+ String getSymbolicName();
/** Returns the directives specified on the symbolic name */
- public Map<String, String> getBundleDirectives();
+ Map<String, String> getBundleDirectives();
/** Returns the attributes specified on the symbolic name */
- public Map<String, String> getBundleAttributes();
+ Map<String, String> getBundleAttributes();
/** Bundle-Version: */
- public Version getVersion();
+ Version getVersion();
/** Returns a String which can be turned into a URL to the bundle binary */
- public String getLocation();
+ String getLocation();
/** Import-Package */
- public Set<Content> getImportPackage();
+ Set<Content> getImportPackage();
/** Require-Bundle */
- public Set<Content> getRequireBundle();
+ Set<Content> getRequireBundle();
/** Export-Package */
- public Set<Content> getExportPackage();
+ Set<Content> getExportPackage();
/** Import-Service */
- public Set<Content> getImportService();
+ Set<Content> getImportService();
/** Export-Service */
- public Set<Content> getExportService();
+ Set<Content> getExportService();
/** All the headers in the MANIFEST.MF file */
- public Map<String, String> getHeaders();
+ Map<String, String> getHeaders();
/** The Attribute object in the MANIFEST.MF file */
- public Attributes getRawAttributes();
+ Attributes getRawAttributes();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java b/application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java
index 0f4c1dee2..875db99be 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/ResolveConstraint.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management;
import org.apache.aries.util.VersionRange;
@@ -31,12 +30,12 @@ public interface ResolveConstraint {
* The name of the newly required bundle
* @return Bundle name
*/
- public String getBundleName();
+ String getBundleName();
/**
* The version range of the newly required bundle
* @return allowed range
*/
- public VersionRange getVersionRange();
+ VersionRange getVersionRange();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java
index 1882efaf2..b328ef69c 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management.spi.convert;
import java.io.IOException;
@@ -34,10 +33,10 @@ public interface BundleConversion {
/**
* @return The InputStream to the converted bundle.
*/
- public InputStream getInputStream() throws IOException;
+ InputStream getInputStream() throws IOException;
/**
* @return The bundle information for the converted bundle.
*/
- public BundleInfo getBundleInfo() throws IOException;
+ BundleInfo getBundleInfo() throws IOException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java
index 9235ace52..746039ec2 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java
@@ -36,6 +36,6 @@ public interface BundleConverter {
* @return valid input stream or null if this converter does not support conversion of
* this artifact type.
*/
- public BundleConversion convert (IDirectory parentEba, IFile fileInEba) throws ConversionException;
+ BundleConversion convert (IDirectory parentEba, IFile fileInEba) throws ConversionException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java
index d658692e9..6495ee09a 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java
@@ -29,25 +29,25 @@ import org.osgi.framework.BundleException;
public interface BundleFramework
{
- public static final String SHARED_BUNDLE_FRAMEWORK = "shared.bundle.framework";
+ String SHARED_BUNDLE_FRAMEWORK = "shared.bundle.framework";
/**
* Initialises the framework (but does not start the framework bundle)
* @throws BundleException
*/
- public void init() throws BundleException;
+ void init() throws BundleException;
/**
* Starts the framework and the framework bundle
* @throws BundleException
*/
- public void start() throws BundleException;
+ void start() throws BundleException;
/**
* Closes the framework and any associated resource
* @throws BundleException
*/
- public void close() throws BundleException;
+ void close() throws BundleException;
/**
* Installs a bundle to this framework.
@@ -56,45 +56,45 @@ public interface BundleFramework
* @return the bundle that was installed
* @throws BundleException
*/
- public Bundle install(BundleSuggestion suggestion, AriesApplication app) throws BundleException;
+ Bundle install(BundleSuggestion suggestion, AriesApplication app) throws BundleException;
/**
* Removes a bundle from this framework
* @param b The bundle to remove
* @throws BundleException
*/
- public void uninstall(Bundle b) throws BundleException;
+ void uninstall(Bundle b) throws BundleException;
/**
* Start a previously installed bundle in this framework.
* @param b the bundle to start
* @throws BundleException
*/
- public void start(Bundle b) throws BundleException;
+ void start(Bundle b) throws BundleException;
/**
* Stop a previously installed bundle in this framework.
* @param b the bundle to stop
* @throws BundleException
*/
- public void stop(Bundle b) throws BundleException;
+ void stop(Bundle b) throws BundleException;
/**
* Returns the bundle context for the framework.
* @return a bundle context representing the framework
*/
- public BundleContext getIsolatedBundleContext();
+ BundleContext getIsolatedBundleContext();
/**
* Returns the OSGi bundle representing the framework
* @return a bundle representing the framework
*/
- public Bundle getFrameworkBundle();
+ Bundle getFrameworkBundle();
/**
* Returns a list of bundles currently installed in this framework
* @return the bundles in the framework.
*/
- public List<Bundle> getBundles();
+ List<Bundle> getBundles();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java
index 21b0fe633..ec8a43267 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfiguration.java
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management.spi.framework;
import java.util.Properties;
public interface BundleFrameworkConfiguration {
- public String getFrameworkID();
+ String getFrameworkID();
- public Properties getFrameworkProperties();
+ Properties getFrameworkProperties();
- public Properties getFrameworkManifest();
+ Properties getFrameworkManifest();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java
index 27bacd725..7c4370d72 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkConfigurationFactory.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management.spi.framework;
import org.apache.aries.application.management.AriesApplication;
@@ -29,7 +28,7 @@ public interface BundleFrameworkConfigurationFactory
* @param parentCtx
* @return the framework config
*/
- public BundleFrameworkConfiguration createBundleFrameworkConfig(String frameworkId,
+ BundleFrameworkConfiguration createBundleFrameworkConfig(String frameworkId,
BundleContext parentCtx);
/**
@@ -39,7 +38,7 @@ public interface BundleFrameworkConfigurationFactory
* @param app
* @return the framework config
*/
- public BundleFrameworkConfiguration createBundleFrameworkConfig(String frameworkId,
+ BundleFrameworkConfiguration createBundleFrameworkConfig(String frameworkId,
BundleContext parentCtx, AriesApplication app);
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java
index c71ddfea5..b19c05b4e 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management.spi.framework;
import org.osgi.framework.BundleContext;
@@ -31,6 +30,6 @@ public interface BundleFrameworkFactory
* @return the bundle framework
* @throws BundleException
*/
- public BundleFramework createBundleFramework(BundleContext bc, BundleFrameworkConfiguration config)
+ BundleFramework createBundleFramework(BundleContext bc, BundleFrameworkConfiguration config)
throws BundleException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java
index 0b9c06cf7..f5dc3204d 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.management.spi.framework;
import java.util.Collection;
@@ -45,14 +44,14 @@ public interface BundleFrameworkManager
* @param frameworkBundle - The bundle representing the bundle framework
* @return the bundle framework
*/
- public BundleFramework getBundleFramework(Bundle frameworkBundle);
+ BundleFramework getBundleFramework(Bundle frameworkBundle);
/**
* Gets a reference to the single shared bundle framework. The Shared Bundle
* Framework contains bundle shared between applications
* @return the shared bundle framework
*/
- public BundleFramework getSharedBundleFramework();
+ BundleFramework getSharedBundleFramework();
/**
* Creates a new framework inside the shared bundle framework and installs a
@@ -62,7 +61,7 @@ public interface BundleFrameworkManager
* @return the bundle of the framework
* @throws BundleException
*/
- public Bundle installIsolatedBundles(
+ Bundle installIsolatedBundles(
Collection<BundleSuggestion> bundlesToInstall,
AriesApplication app)
throws BundleException;
@@ -74,18 +73,18 @@ public interface BundleFrameworkManager
* @return the collection of installed bundles.
* @throws BundleException
*/
- public Collection<Bundle> installSharedBundles(
+ Collection<Bundle> installSharedBundles(
Collection<BundleSuggestion> bundlesToInstall,
AriesApplication app)
throws BundleException;
- public boolean allowsUpdate(DeploymentMetadata newMetadata, DeploymentMetadata oldMetadata);
+ boolean allowsUpdate(DeploymentMetadata newMetadata, DeploymentMetadata oldMetadata);
- public interface BundleLocator {
- public Map<DeploymentContent, BundleSuggestion> suggestBundle(Collection<DeploymentContent> bundles) throws BundleException;
+ interface BundleLocator {
+ Map<DeploymentContent, BundleSuggestion> suggestBundle(Collection<DeploymentContent> bundles) throws BundleException;
}
- public void updateBundles(
+ void updateBundles(
DeploymentMetadata newMetadata,
DeploymentMetadata oldMetadata,
AriesApplication app,
@@ -98,20 +97,20 @@ public interface BundleFrameworkManager
* @param b
* @throws BundleException
*/
- public void startBundle(Bundle b) throws BundleException;
+ void startBundle(Bundle b) throws BundleException;
/**
* Stops a previously installed bundle
* @param b
* @throws BundleException
*/
- public void stopBundle(Bundle b) throws BundleException;
+ void stopBundle(Bundle b) throws BundleException;
/**
* Removes a bundle from the runtime
* @param b
* @throws BundleException
*/
- public void uninstallBundle(Bundle b) throws BundleException;
+ void uninstallBundle(Bundle b) throws BundleException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
index 205d9a0dc..75e05bbe6 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
@@ -37,13 +37,13 @@ public interface BundleRepository {
* <li><app symbolic name>_<app version></li>
* </ul>
*/
- public static final String REPOSITORY_SCOPE = "repositoryScope";
- public static final String GLOBAL_SCOPE = "global";
+ String REPOSITORY_SCOPE = "repositoryScope";
+ String GLOBAL_SCOPE = "global";
/**
* A suggested bundle to use.
*/
- public interface BundleSuggestion
+ interface BundleSuggestion
{
/**
* Install the bundle represented by this suggestion via the given context
@@ -53,25 +53,25 @@ public interface BundleRepository {
* @return the installed bundle
* @throws BundleException
*/
- public Bundle install(BundleFramework framework,
+ Bundle install(BundleFramework framework,
AriesApplication app) throws BundleException;
/**
* Get the imports of the bundle
* @return the imported packages
*/
- public Set<Content> getImportPackage();
+ Set<Content> getImportPackage();
/**
* Get the exports of the bundle
* @return the packages to export
*/
- public Set<Content> getExportPackage();
+ Set<Content> getExportPackage();
/**
* @return the version of the bundle.
*/
- public Version getVersion();
+ Version getVersion();
/**
* This method can be queried to discover the cost of using this bundle
* repository. If two repositories define the same bundle with the same version
@@ -79,7 +79,7 @@ public interface BundleRepository {
*
* @return the cost of using this repository.
*/
- public int getCost();
+ int getCost();
}
/**
@@ -90,7 +90,7 @@ public interface BundleRepository {
* @param content the content used to locate a bundle.
* @return the bundle suggestion, or null.
*/
- public BundleSuggestion suggestBundleToUse(DeploymentContent content);
+ BundleSuggestion suggestBundleToUse(DeploymentContent content);
/**
* This method can be queried to discover the cost of using this bundle
@@ -99,5 +99,5 @@ public interface BundleRepository {
*
* @return the cost of using this repository.
*/
- public int getCost();
+ int getCost();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java
index 5073f9052..4da1cb686 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java
@@ -19,7 +19,6 @@
package org.apache.aries.application.management.spi.repository;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Map;
import org.apache.aries.application.DeploymentContent;
@@ -34,14 +33,14 @@ public interface BundleRepositoryManager
* @param applicationVersion
* @return the collection of bundle repositories for an app.
*/
- public Collection<BundleRepository> getBundleRepositoryCollection(
+ Collection<BundleRepository> getBundleRepositoryCollection(
String applicationName, String applicationVersion);
/**
* Gets all known bundle repositories
* @return all known bundle repositories.
*/
- public Collection<BundleRepository> getAllBundleRepositories();
+ Collection<BundleRepository> getAllBundleRepositories();
/**
* Get a collection of bundle installation suggestions from repositories
@@ -52,7 +51,7 @@ public interface BundleRepositoryManager
* @return the bundle suggestions
* @throws ContextException
*/
- public Map<DeploymentContent, BundleSuggestion> getBundleSuggestions(
+ Map<DeploymentContent, BundleSuggestion> getBundleSuggestions(
String applicationName,
String applicationVersion,
Collection<DeploymentContent> content) throws ContextException;
@@ -64,7 +63,7 @@ public interface BundleRepositoryManager
* @return the bundle suggestions
* @throws ContextException
*/
- public Map<DeploymentContent, BundleSuggestion> getBundleSuggestions(
+ Map<DeploymentContent, BundleSuggestion> getBundleSuggestions(
Collection<DeploymentContent> content) throws ContextException;
/**
@@ -75,7 +74,7 @@ public interface BundleRepositoryManager
* @return the bundle suggestions
* @throws ContextException
*/
- public Map<DeploymentContent, BundleSuggestion> getBundleSuggestions(
+ Map<DeploymentContent, BundleSuggestion> getBundleSuggestions(
Collection<BundleRepository> brs,
Collection<DeploymentContent> content) throws ContextException;
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
index cd5346763..0af8e96dc 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
@@ -26,7 +26,6 @@ import org.apache.aries.application.Content;
import org.apache.aries.application.management.AriesApplication;
import org.apache.aries.application.management.ResolveConstraint;
import org.apache.aries.application.management.ResolverException;
-import org.apache.aries.application.management.spi.repository.PlatformRepository;
import org.apache.aries.application.modelling.DeployedBundles;
import org.apache.aries.application.modelling.ModelledResource;
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java
index 9579f0fa3..2c51bd45f 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java
@@ -22,8 +22,7 @@ import org.apache.aries.application.ApplicationMetadata;
import org.apache.aries.application.management.ResolverException;
import org.apache.aries.application.modelling.DeployedBundles;
-public interface PostResolveTransformer
-{
+public interface PostResolveTransformer {
/**
* This method is to perform any post process after the resolver returns back a collection of bundles. It returns the updated manifest map.
* @param appMetaData The application that was resolved
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java
index fc6b56b44..c60c54b4f 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PreResolveHook.java
@@ -41,5 +41,5 @@ public interface PreResolveHook
* @param resources A mutable collection of ModelledResources that can have
* more elements added or removed.
*/
- public void collectFakeResources(Collection<ModelledResource> resources);
+ void collectFakeResources(Collection<ModelledResource> resources);
}
\ No newline at end of file
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
index bb7a71762..c0006fe2a 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
@@ -43,24 +43,24 @@ public interface AriesApplicationContextManager {
* @throws BundleException
* @throws ManagementException
*/
- public AriesApplicationContext getApplicationContext(AriesApplication app) throws BundleException, ManagementException;
+ AriesApplicationContext getApplicationContext(AriesApplication app) throws BundleException, ManagementException;
/**
* @return The set of all AriesApplicationContexts.
*/
- public Set<AriesApplicationContext> getApplicationContexts();
+ Set<AriesApplicationContext> getApplicationContexts();
/**
* Update the AriesApplication and return an updated application context.
* @throws UpdateException if the update failed
* @throws IllegalArgumentException if the app is not currently installed
*/
- public AriesApplicationContext update(AriesApplication app, DeploymentMetadata oldMetadata) throws UpdateException;
+ AriesApplicationContext update(AriesApplication app, DeploymentMetadata oldMetadata) throws UpdateException;
/**
* Remove the provided AriesApplicationContext from the running system.
*
* @param app the application to remove.
*/
- public void remove(AriesApplicationContext app) throws BundleException;
+ void remove(AriesApplicationContext app) throws BundleException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java
index 2b82704a9..8c880cd8f 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java
@@ -33,12 +33,12 @@ public interface LocalPlatform {
* @return Temporary directory
* @throws IOException
*/
- public File getTemporaryDirectory() throws IOException;
+ File getTemporaryDirectory() throws IOException;
/**
* Obtain a temporary file
* @return Temporary directory
* @throws IOException
*/
- public File getTemporaryFile() throws IOException;
+ File getTemporaryFile() throws IOException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java b/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java
index c0af54e80..8cad887b3 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java
@@ -39,63 +39,63 @@ public interface UpdateStrategy {
/**
* Are the two deployments subject to update or do they require full reinstall
*/
- public boolean allowsUpdate(DeploymentMetadata newMetadata, DeploymentMetadata oldMetadata);
+ boolean allowsUpdate(DeploymentMetadata newMetadata, DeploymentMetadata oldMetadata);
/**
* Update an application
*/
- public void update(UpdateInfo paramUpdateInfo) throws UpdateException;
+ void update(UpdateInfo paramUpdateInfo) throws UpdateException;
/**
* Representation for an update request
*/
- public static interface UpdateInfo
+ interface UpdateInfo
{
/**
* Find {@link BundleSuggestion} objects for new bundle requests
*/
- public Map<DeploymentContent, BundleRepository.BundleSuggestion> suggestBundle(Collection<DeploymentContent> bundles)
+ Map<DeploymentContent, BundleRepository.BundleSuggestion> suggestBundle(Collection<DeploymentContent> bundles)
throws BundleException;
/**
* Register a new bundle with the application (i.e. a new bundle was installed)
*/
- public void register(Bundle bundle);
+ void register(Bundle bundle);
/**
* Unregister a bundle from the application (i.e. the bundle was uninstalled)
*/
- public void unregister(Bundle bundle);
+ void unregister(Bundle bundle);
/**
* Get a {@link BundleFramework} object for the shared framework
*/
- public BundleFramework getSharedFramework();
+ BundleFramework getSharedFramework();
/**
* Get a {@link BundleFramework} object for the isolated framework corresponding
* to the application to be updated
*/
- public BundleFramework getAppFramework();
+ BundleFramework getAppFramework();
/**
* Get the {@link DeploymentMetadata} that is currently active and to be phased out
*/
- public DeploymentMetadata getOldMetadata();
+ DeploymentMetadata getOldMetadata();
/**
* Get the {@link DeploymentMetadata} that is to be activated
*/
- public DeploymentMetadata getNewMetadata();
+ DeploymentMetadata getNewMetadata();
/**
* Get the {@link AriesApplication} object being updated
*/
- public AriesApplication getApplication();
+ AriesApplication getApplication();
/**
* Whether to start any newly installed bundles
*/
- public boolean startBundles();
+ boolean startBundles();
}
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
index 0b6ee1b8f..64cfde653 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/DeploymentMFElement.java
@@ -18,11 +18,10 @@
*/
package org.apache.aries.application.modelling;
-public interface DeploymentMFElement
-{
+public interface DeploymentMFElement {
/**
* @return String suitable for inclusion in DEPLOYMENT.MF
*/
- public String toDeploymentString();
+ String toDeploymentString();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
index 2fb7d6163..53a4b3fb1 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedPackage.java
@@ -22,8 +22,7 @@ package org.apache.aries.application.modelling;
* Model an exported package.
*
*/
-public interface ExportedPackage extends Provider, DeploymentMFElement
-{
+public interface ExportedPackage extends Provider, DeploymentMFElement {
/**
* The package name
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedService.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedService.java
index 3152ca668..1295d45cc 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedService.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ExportedService.java
@@ -22,7 +22,5 @@ package org.apache.aries.application.modelling;
* This interface models the exported service. It has no other methods apart from the
* two super interfaces Provider and WrappedServiceMetadata.
*/
-public interface ExportedService extends Provider, WrappedServiceMetadata
-{
-
+public interface ExportedService extends Provider, WrappedServiceMetadata {
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
index 385dd5885..c808e7722 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedBundle.java
@@ -22,8 +22,7 @@ package org.apache.aries.application.modelling;
* Model a required bundle.
*
*/
-public interface ImportedBundle extends Consumer
-{
+public interface ImportedBundle extends Consumer {
/**
* The imported bundle symbolic name
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
index fe82a64d0..c092b3026 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedPackage.java
@@ -22,8 +22,7 @@ import java.util.Map;
/**
* Model an imported package.
*/
-public interface ImportedPackage extends Consumer, DeploymentMFElement
-{
+public interface ImportedPackage extends Consumer, DeploymentMFElement {
/**
* The imported package name
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedService.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedService.java
index 0cedf88fa..6f0aec19c 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedService.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ImportedService.java
@@ -21,7 +21,6 @@ package org.apache.aries.application.modelling;
* This interface represents the imported service. It has no other methods apart from the
* two super interfaces Consumer, DeploymentMFElement and WrappedReferenceMetadata.
*/
-public interface ImportedService extends Consumer, WrappedReferenceMetadata, DeploymentMFElement
-{
+public interface ImportedService extends Consumer, WrappedReferenceMetadata, DeploymentMFElement {
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResource.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
index 93aaf599f..0fee04164 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResource.java
@@ -23,8 +23,7 @@ import java.util.Collection;
* Model a bundle resource.
*
*/
-public interface ModelledResource extends DeploymentMFElement
-{
+public interface ModelledResource extends DeploymentMFElement {
/**
* The resource's symbolic name
@@ -41,7 +40,7 @@ public interface ModelledResource extends DeploymentMFElement
/** Returns a String which can be turned into a URL to the bundle binary
* @return the location of the bundle
*/
- public String getLocation();
+ String getLocation();
/**
* Import-Package header modelled to be a collection of the imported packages objects.
@@ -97,6 +96,6 @@ public interface ModelledResource extends DeploymentMFElement
* The fragment host.
* @return The fragment host.
*/
- public ImportedBundle getFragmentHost();
+ ImportedBundle getFragmentHost();
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
index 5b3ab6354..76cab0512 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ModelledResourceManager.java
@@ -23,8 +23,7 @@ import java.io.InputStream;
import org.apache.aries.util.filesystem.IDirectory;
-public interface ModelledResourceManager
-{
+public interface ModelledResourceManager {
/**
* Utility interface for re-presenting a source of InputStreams
*/
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
index 7a6340f72..3e600b5aa 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ModellingConstants.java
@@ -20,15 +20,14 @@ package org.apache.aries.application.modelling;
import org.osgi.framework.Constants;
-public class ModellingConstants
-{
- public static final String OBR_SYMBOLIC_NAME = "symbolicname";
- public static final String OBR_PRESENTATION_NAME = "presentationname";
- public static final String OBR_MANIFEST_VERSION = "manifestversion";
- public static final String OBR_BUNDLE = "bundle";
- public static final String OBR_PACKAGE = "package";
- public static final String OBR_SERVICE = "service";
- public static final String OBR_COMPOSITE_BUNDLE = "composite-bundle";
- public static final String OBR_UNKNOWN = "unknown";
- public static final String OPTIONAL_KEY = Constants.RESOLUTION_DIRECTIVE + ":";
+public class ModellingConstants {
+ public static final String OBR_SYMBOLIC_NAME = "symbolicname";
+ public static final String OBR_PRESENTATION_NAME = "presentationname";
+ public static final String OBR_MANIFEST_VERSION = "manifestversion";
+ public static final String OBR_BUNDLE = "bundle";
+ public static final String OBR_PACKAGE = "package";
+ public static final String OBR_SERVICE = "service";
+ public static final String OBR_COMPOSITE_BUNDLE = "composite-bundle";
+ public static final String OBR_UNKNOWN = "unknown";
+ public static final String OPTIONAL_KEY = Constants.RESOLUTION_DIRECTIVE + ":";
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
index 0bc5dd2bd..e24bd1eaa 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ParsedServiceElements.java
@@ -16,33 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.modelling;
-
import java.util.Collection;
-
-
/**
- * A simple data structure containing two immutable Collections,
+ * A simple data structure containing two immutable Collections,
* one each of ImportedServiceImpl and ExportedServiceImpl
*/
-public interface ParsedServiceElements
-{
-
-
-
-
- /**
+public interface ParsedServiceElements {
+ /**
* Get the ImportedServices
* @return imported services
*/
- public Collection<ImportedService> getReferences();
+ Collection<ImportedService> getReferences();
/**
* Get the exported services
* @return exported services
*/
- public Collection<ExportedService> getServices();
+ Collection<ExportedService> getServices();
}
\ No newline at end of file
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ParserProxy.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
index 4a214b5f8..62bcd8143 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ParserProxy.java
@@ -36,14 +36,14 @@ public interface ParserProxy {
* @param blueprintsToParse URLs to blueprint xml files
* @return List of (wrapped) ServiceMetadata objects
*/
- public List<? extends WrappedServiceMetadata> parse (List<URL> blueprintsToParse) throws Exception;
+ List<? extends WrappedServiceMetadata> parse (List<URL> blueprintsToParse) throws Exception;
/**
* Parse a blueprint xml files and extract the parsed ServiceMetadata objects
* @param blueprintToParse URL to blueprint xml file
* @return List of (wrapped) ServiceMetadata objects
*/
- public List<? extends WrappedServiceMetadata> parse (URL blueprintToParse) throws Exception;
+ List<? extends WrappedServiceMetadata> parse (URL blueprintToParse) throws Exception;
/**
* Parse an InputStream containing blueprint xml and extract the parsed ServiceMetadata objects
@@ -51,13 +51,13 @@ public interface ParserProxy {
* for closing the stream afterwards.
* @return List of (wrapped) ServiceMetadata objects
*/
- public List<? extends WrappedServiceMetadata> parse (InputStream blueprintToParse) throws Exception;
+ List<? extends WrappedServiceMetadata> parse (InputStream blueprintToParse) throws Exception;
/**
* Parse an InputStream containing blueprint xml and extract Service, Reference and RefList
* elements.
* @return All parsed Service, Reference and RefList elements
*/
- public ParsedServiceElements parseAllServiceElements (InputStream blueprintToParse) throws Exception;
+ ParsedServiceElements parseAllServiceElements (InputStream blueprintToParse) throws Exception;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/Provider.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/Provider.java
index c7391f904..538ce80c4 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/Provider.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/Provider.java
@@ -25,8 +25,7 @@ import java.util.Map;
/** Base interface to model a bundle, package or service
*/
-public interface Provider
-{
+public interface Provider {
/**
* Get resource type.
* @return The resource type.
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ResourceType.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ResourceType.java
index 0d4e64ca1..ab5975016 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ResourceType.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ResourceType.java
@@ -16,11 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.modelling;
-
-
public enum ResourceType {BUNDLE, PACKAGE, SERVICE, COMPOSITE, OTHER;
/**
* An enum class to represent the resource type, such as bundle, package, service etc.
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
index 3283d03d0..1bec1c185 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/ServiceModeller.java
@@ -30,7 +30,6 @@ public interface ServiceModeller {
* @param bundle
* @return
*/
- public ParsedServiceElements modelServices(BundleManifest manifest, IDirectory bundle)
- throws ModellerException;
+ ParsedServiceElements modelServices(BundleManifest manifest, IDirectory bundle) throws ModellerException;
}
diff --git a/application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java b/application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
index bf53a678a..9ab17411a 100644
--- a/application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
+++ b/application/application-api/src/main/java/org/apache/aries/application/modelling/WrappedReferenceMetadata.java
@@ -16,15 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.modelling;
-
/**
* Information about a parsed blueprint reference
*/
-public interface WrappedReferenceMetadata
-{
+public interface WrappedReferenceMetadata {
/**
* Get the properties of the associated blueprint service
* @return The filter, or null for no filter
diff --git a/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java b/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
index 601ce3acc..e2c2165b8 100644
--- a/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
+++ b/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
@@ -74,8 +74,7 @@ import org.osgi.service.blueprint.container.ServiceUnavailableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DeploymentManifestManagerImpl implements DeploymentManifestManager
-{
+public class DeploymentManifestManagerImpl implements DeploymentManifestManager {
private final Logger _logger = LoggerFactory.getLogger(DeploymentManifestManagerImpl.class);
private AriesApplicationResolver resolver;
@@ -300,7 +299,7 @@ public class DeploymentManifestManagerImpl implements DeploymentManifestManager
for (ModelledResource mr : resolvedSharedBundles) {
String mrName = mr.getSymbolicName() + "_" + mr.getExportedBundle().getVersion();
// if current resource isn't an isolated bundle check it's requirements
- if (!!! suspects.contains(mrName)) {
+ if (! suspects.contains(mrName)) {
// Iterate through the imported packages of the current shared bundle.
for (ImportedPackage ip : mr.getImportedPackages()) {
String packageName = ip.getPackageName();
@@ -316,7 +315,7 @@ public class DeploymentManifestManagerImpl implements DeploymentManifestManager
}
// If we have found at least one matching entry, we construct the sub message for the
// exception.
- if (!!! bundlesExportingPackage.isEmpty()) {
+ if (! bundlesExportingPackage.isEmpty()) {
String newMsg;
if (bundlesExportingPackage.size() > 1) {
newMsg = MessageUtil.getMessage("SHARED_BUNDLE_IMPORTING_FROM_ISOLATED_BUNDLES",
@@ -341,7 +340,7 @@ public class DeploymentManifestManagerImpl implements DeploymentManifestManager
ResolverException rx = new ResolverException (message);
rx.setUnsatisfiedRequirements(unsatisfiedRequirements);
_logger.debug(LOG_EXIT, "generateDeploymentManifest", new Object[] {rx});
- throw (rx);
+ throw rx;
}
}
@@ -538,7 +537,7 @@ public class DeploymentManifestManagerImpl implements DeploymentManifestManager
for (ModelledResource mr : resolvedSharedBundles) {
String thisBundle = mr.getExportedBundle().getSymbolicName() + "_" +
mr.getExportedBundle().getVersion();
- if (!expectedBundles.contains(thisBundle) && (isolatedBundles.contains(thisBundle))) {
+ if (!expectedBundles.contains(thisBundle) && isolatedBundles.contains(thisBundle)) {
suspects.add(thisBundle);
}
}
diff --git a/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java b/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java
index c7b1cdffd..3940b5bab 100644
--- a/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java
+++ b/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/MessageUtil.java
@@ -55,17 +55,17 @@ public class MessageUtil
public void processMessages()
{
- for (Message m : errors) {
+ // for (Message m : errors) {
//Tr.error(tc, m.msgKey, m.inserts);
// use logger
- }
+ // }
- for (Message m : warnings) {
+ // for (Message m : warnings) {
//Tr.warning(tc, m.msgKey, m.inserts);
// use logger
- }
+ // }
}
@@ -98,7 +98,7 @@ public class MessageUtil
public boolean hasErrors()
{
- return !!!errors.isEmpty();
+ return !errors.isEmpty();
}
public void error(String msgKey, Object ... inserts)
diff --git a/application/application-itest-interface/src/main/java/org/apache/aries/sample/HelloWorld.java b/application/application-itest-interface/src/main/java/org/apache/aries/sample/HelloWorld.java
index 3cb42b2cf..01dab08c2 100644
--- a/application/application-itest-interface/src/main/java/org/apache/aries/sample/HelloWorld.java
+++ b/application/application-itest-interface/src/main/java/org/apache/aries/sample/HelloWorld.java
@@ -19,6 +19,5 @@
package org.apache.aries.sample;
public interface HelloWorld {
-
- public String getMessage();
+ String getMessage();
}
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
index 96980d6d3..e7d076bdf 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
@@ -503,7 +503,7 @@ public class OBRResolverAdvancedTest extends AbstractIntegrationTest {
File bundleFile = new File(fileName);
IDirectory jarDir = FileSystem.getFSRoot(bundleFile);
String uri = "";
- if (!!!nullURI) {
+ if (!nullURI) {
uri = bundleFile.toURI().toString();
}
if ("delete.jar".equals(fileName)) {
diff --git a/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java b/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
index 8dc1f3f17..caafacc57 100644
--- a/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
+++ b/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
@@ -27,12 +27,10 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.aries.application.ApplicationMetadata;
-import org.apache.aries.application.Content;
import org.apache.aries.application.DeploymentMetadata;
import org.apache.aries.application.management.AriesApplication;
import org.apache.aries.application.management.BundleInfo;
diff --git a/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java b/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
index 180f06122..02472bcab 100644
--- a/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
+++ b/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
@@ -425,8 +425,8 @@ public class AriesApplicationManagerImpl implements AriesApplicationManager {
public AriesApplicationContext update(AriesApplication app, DeploymentMetadata depMf) throws UpdateException {
if (!(app instanceof AriesApplicationImpl)) throw new IllegalArgumentException("Argument is not AriesApplication created by this manager");
- if (!!!app.getApplicationMetadata().getApplicationSymbolicName().equals(depMf.getApplicationSymbolicName())
- || !!!app.getApplicationMetadata().getApplicationVersion().equals(depMf.getApplicationVersion())) {
+ if (!app.getApplicationMetadata().getApplicationSymbolicName().equals(depMf.getApplicationSymbolicName())
+ || !app.getApplicationMetadata().getApplicationVersion().equals(depMf.getApplicationVersion())) {
throw new IllegalArgumentException("The deployment metadata does not match the application.");
}
diff --git a/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java b/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
index 2ca6f5553..e6ddfd5be 100644
--- a/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
+++ b/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
@@ -53,7 +53,7 @@ public class ApplicationRepository implements BundleRepository
BundleInfo bundleInfo = null;
if ((app.getBundleInfo() != null) && (!app.getBundleInfo().isEmpty())) {
for (BundleInfo bi : app.getBundleInfo()) {
- if (bi.getSymbolicName().equals(content.getContentName()) && (bi.getVersion().equals(content.getVersion().getExactVersion()))) {
+ if (bi.getSymbolicName().equals(content.getContentName()) && bi.getVersion().equals(content.getVersion().getExactVersion())) {
bundleInfo = bi;
break;
}
diff --git a/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java b/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
index 72ebd514e..13d547830 100644
--- a/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
+++ b/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
@@ -101,7 +101,7 @@ public class AriesApplicationManagerImplTest {
StringBuilder deployedContents = new StringBuilder();
boolean beginning= true;
for (BundleInfo bundle: byValueBundles) {
- if (!!!beginning) {
+ if (!beginning) {
deployedContents.append(",");
}
deployedContents.append(bundle.getSymbolicName()+";" + AppConstants.DEPLOYMENT_BUNDLE_VERSION + "=" + bundle.getVersion());
diff --git a/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java b/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java
index f646bcd58..81255ae14 100644
--- a/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java
+++ b/application/application-modeller-standalone/src/main/java/org/apache/aries/application/modelling/standalone/OfflineModellingFactory.java
@@ -110,7 +110,7 @@ public class OfflineModellingFactory {
parser.populate(DUMMY_HANDLER_SET, cdr);
return cdr;
}
- };
+ }
public static ParserProxy getOfflineParserProxy() {
ModellingManagerImpl modellingManager = new ModellingManagerImpl();
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
index a5d147d4d..7228c80af 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
@@ -242,7 +242,7 @@ abstract public class AbstractParserProxy implements ParserProxy {
String compName = referenceMetadata.getComponentName();
String blueprintFilter = referenceMetadata.getFilter();
String id = referenceMetadata.getId();
- boolean isMultiple = (referenceMetadata instanceof ReferenceListMetadata);
+ boolean isMultiple = referenceMetadata instanceof ReferenceListMetadata;
//The blueprint parser teams up with JPA and blueprint resource ref
// namespace handlers to give us service imports of the form,
@@ -308,7 +308,7 @@ abstract public class AbstractParserProxy implements ParserProxy {
* @param output
*/
private void traverseComponent(ComponentMetadata component, Set<ComponentMetadata> output) {
- if (!!!output.add(component)) return;
+ if (!output.add(component)) return;
if (component instanceof BeanMetadata) {
BeanMetadata bean = (BeanMetadata) component;
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
index 229bf64bd..29b8ff6d0 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
@@ -345,7 +345,7 @@ public final class DeployedBundlesImpl implements DeployedBundles
}
int buffLen = buff.length();
- String pkgString = (buffLen > 0 ? buff.substring(0, buffLen - 2) : "");
+ String pkgString = buffLen > 0 ? buff.substring(0, buffLen - 2) : "";
ResolverException re = new ResolverException(MessageUtil.getMessage(
"INCOMPATIBLE_PACKAGE_VERSION_REQUIREMENTS", new Object[] { assetName, pkgString }));
@@ -430,7 +430,7 @@ public final class DeployedBundlesImpl implements DeployedBundles
}
int length = builder.length();
- String result = (length > 0 ? builder.substring(0, length - 1) : "");
+ String result = length > 0 ? builder.substring(0, length - 1) : "";
logger.debug(LOG_EXIT, "createManifestString", new Object[]{result});
return result;
}
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
index 395f650bf..c8f719ed4 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
@@ -18,8 +18,6 @@
*/
package org.apache.aries.application.modelling.impl;
-
-
import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
import static org.apache.aries.application.utils.AppConstants.LOG_EXIT;
@@ -44,12 +42,10 @@ import org.osgi.framework.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* A model of a Bundle imported, or required, by something. For example, an entry in an APPLICATION.MF.
*/
-public class ImportedBundleImpl implements ImportedBundle
-{
+public class ImportedBundleImpl implements ImportedBundle {
private final Map<String, String> _attributes;
private final String _filterString;
@@ -134,8 +130,7 @@ public class ImportedBundleImpl implements ImportedBundle
logger.debug(LOG_ENTRY, "isOptional");
boolean optional = false;
if (_attributes.containsKey(Constants.RESOLUTION_DIRECTIVE + ":")) {
- if ((Constants.RESOLUTION_OPTIONAL).equals
- (_attributes.get(Constants.RESOLUTION_DIRECTIVE + ":"))) {
+ if (Constants.RESOLUTION_OPTIONAL.equals(_attributes.get(Constants.RESOLUTION_DIRECTIVE + ":"))) {
optional = true;
}
}
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
index 18551eb39..681c2c101 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
@@ -31,7 +31,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.aries.application.InvalidAttributeException;
-import org.apache.aries.application.modelling.ExportedPackage;
import org.apache.aries.application.modelling.ImportedPackage;
import org.apache.aries.application.modelling.Provider;
import org.apache.aries.application.modelling.ResourceType;
@@ -70,7 +69,7 @@ public class ImportedPackageImpl implements ImportedPackage
_package = pkg;
String versionRange = null;
if (attributes != null) {
- _optional = (Constants.RESOLUTION_OPTIONAL.equals(attributes.get(OPTIONAL_KEY)));
+ _optional = Constants.RESOLUTION_OPTIONAL.equals(attributes.get(OPTIONAL_KEY));
versionRange = attributes.get(Constants.VERSION_ATTRIBUTE);
_attributes = new HashMap<String, String>(attributes);
} else {
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
index 4b8f525b8..949aa5633 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
@@ -59,8 +59,8 @@ public class ImportedServiceImpl implements ImportedService
private final Map<String, String> _attributes;
private String _toString;
private String _attribFilterString; // The manner in which we set means it can't be final
- private final static Pattern SERVICE_EQUALS_SERVICE = Pattern.compile("\\(" + ResourceType.SERVICE.toString()
- + "=" + ResourceType.SERVICE.toString() + "\\)");
+ private final static Pattern SERVICE_EQUALS_SERVICE = Pattern.compile("\\(" + SERVICE
+ + "=" + SERVICE + "\\)");
private final Logger logger = LoggerFactory.getLogger(ImportedServiceImpl.class);
/**
* Build an ImportedServiceImpl from its elements
@@ -140,7 +140,7 @@ public class ImportedServiceImpl implements ImportedService
@Deprecated
public ImportedServiceImpl (String ifaceName, Map<String, String> attributes) throws InvalidAttributeException {
- _optional = ("optional".equals(attributes.get("availability:")));
+ _optional = "optional".equals(attributes.get("availability:"));
_iface = ifaceName;
_isMultiple = false;
_componentName = null;
@@ -164,8 +164,8 @@ public class ImportedServiceImpl implements ImportedService
public ResourceType getType() {
logger.debug(LOG_ENTRY, "getType");
- logger.debug(LOG_EXIT, "getType", ResourceType.SERVICE);
- return ResourceType.SERVICE;
+ logger.debug(LOG_EXIT, "getType", SERVICE);
+ return SERVICE;
}
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
index 8515e3a59..57af5aac3 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
* */
-
package org.apache.aries.application.modelling.impl;
import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
@@ -26,8 +25,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -60,8 +57,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ModelledResourceManagerImpl implements ModelledResourceManager
-{
+public class ModelledResourceManagerImpl implements ModelledResourceManager {
private final Logger _logger = LoggerFactory.getLogger(ModelledResourceManagerImpl.class);
private ParserProxy _parserProxy;
private ModellingManager _modellingManager;
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/internal/BundleBlueprintParser.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/internal/BundleBlueprintParser.java
index 1ed74c6d5..7a70ba699 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/internal/BundleBlueprintParser.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/internal/BundleBlueprintParser.java
@@ -74,9 +74,9 @@ public class BundleBlueprintParser {
boolean match = false;
if (!directory.equals(dir)) {
match = false;
- } else if (filename != null) {
- match = (filename.equals(fil));
- } else {
+ } else if (filename != null) {
+ match = filename.equals(fil);
+ } else {
match = filenamePattern.matcher(fil).matches();
}
return match;
diff --git a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java
index 56374122b..39ed7b760 100644
--- a/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java
+++ b/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java
@@ -47,9 +47,7 @@ import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-public class ModellingHelperImpl implements ModellingHelper
-{
+public class ModellingHelperImpl implements ModellingHelper {
private static final Logger logger = LoggerFactory.getLogger(ModellingHelperImpl.class);
@@ -87,7 +85,7 @@ public class ModellingHelperImpl implements ModellingHelper
boolean allPresent = true;
String mandatory = (String) p.getAttributes().get(Constants.MANDATORY_DIRECTIVE + ":");
- if(mandatory != null && !mandatory.equals("")) {
+ if(mandatory != null && !mandatory.isEmpty()) {
List<String> attributeNames = ManifestHeaderProcessor.split(mandatory, ",");
for(String name : attributeNames) {
@@ -140,15 +138,15 @@ public class ModellingHelperImpl implements ModellingHelper
Map<String,String> att2 = new HashMap<String, String>(p2.getAttributes());
// Get the versions, we remove them so that the remaining attributes can be matched.
- String rangeStr1 = att1.remove(Constants.VERSION_ATTRIBUTE);
- String rangeStr2 = att2.remove(Constants.VERSION_ATTRIBUTE);
+ String rangeStr1 = att1.remove(VERSION_ATTRIBUTE);
+ String rangeStr2 = att2.remove(VERSION_ATTRIBUTE);
//Also remove the optional directive as we don't care about that either
att1.remove(OPTIONAL_KEY);
att2.remove(OPTIONAL_KEY);
//If identical take either, otherwise null!
- Map<String, String> mergedAttribs = (att1.equals(att2) ? att1 : null);
+ Map<String, String> mergedAttribs = att1.equals(att2) ? att1 : null;
if (mergedAttribs == null)
{
// Cannot intersect requirements if attributes are not identical.
@@ -173,16 +171,16 @@ public class ModellingHelperImpl implements ModellingHelper
else
{
// Use the intersected version range.
- mergedAttribs.put(Constants.VERSION_ATTRIBUTE, intersectRange.toString());
+ mergedAttribs.put(VERSION_ATTRIBUTE, intersectRange.toString());
}
}
else if (rangeStr1 != null)
{
- mergedAttribs.put(Constants.VERSION_ATTRIBUTE, rangeStr1);
+ mergedAttribs.put(VERSION_ATTRIBUTE, rangeStr1);
}
else if (rangeStr2 != null)
{
- mergedAttribs.put(Constants.VERSION_ATTRIBUTE, rangeStr2);
+ mergedAttribs.put(VERSION_ATTRIBUTE, rangeStr2);
}
//If both optional, we are optional, otherwise use the default
diff --git a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
index 742e4a069..ac043e57e 100644
--- a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
+++ b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.resolver.obr;
import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
@@ -81,8 +80,7 @@ import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
-public class OBRAriesResolver implements AriesApplicationResolver
-{
+public class OBRAriesResolver implements AriesApplicationResolver {
private static Logger log = LoggerFactory.getLogger(OBRAriesResolver.class);
private final RepositoryAdmin repositoryAdmin;
@@ -248,9 +246,9 @@ public class OBRAriesResolver implements AriesApplicationResolver
// add application repository
resolveRepos.add(appRepo);
- if (!!!noExtraRepositories) {
+ if (!noExtraRepositories) {
// add local repository if configured
- if (!(excludeLocalRuntime())) {
+ if (!excludeLocalRuntime()) {
resolveRepos.add(getLocalRepository(repositoryAdmin));
}
// Need to refresh the repositories added to repository admin
@@ -512,7 +510,7 @@ public class OBRAriesResolver implements AriesApplicationResolver
}
}
- if (!!!found && !!!r.isOptional()) {
+ if (!found && !r.isOptional()) {
result = false;
break outer;
}
@@ -599,7 +597,7 @@ public class OBRAriesResolver implements AriesApplicationResolver
.get(Constants.VERSION_ATTRIBUTE));
inserts.add(vr.getMinimumVersion());
- if (!!!vr.isExactVersion()) {
+ if (!vr.isExactVersion()) {
msgKey.append(vr.isMinimumExclusive() ? "_LOWEX" : "_LOW");
if (vr.getMaximumVersion() != null) {
msgKey.append(vr.isMaximumExclusive() ? "_UPEX" : "_UP");
@@ -702,7 +700,7 @@ public class OBRAriesResolver implements AriesApplicationResolver
Collection<ModelledResource> result = new ArrayList<ModelledResource>();
- if ((bundleInfos != null) && (!!!bundleInfos.isEmpty())) {
+ if ((bundleInfos != null) && (!bundleInfos.isEmpty())) {
for (BundleInfo bi : bundleInfos) {
try {
result.add(modellingManager.getModelledResource(null, bi, null, null));
diff --git a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java
index f0c0d98ec..54366c575 100644
--- a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java
+++ b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java
@@ -67,7 +67,7 @@ public class ApplicationResourceImpl implements Resource
return delgate.matchCase(dictionary);
}
- public boolean matches(Map<java.lang.String,?> map) {
+ public boolean matches(Map<String,?> map) {
return delgate.matches(map);
}
@@ -86,13 +86,13 @@ public class ApplicationResourceImpl implements Resource
for (int i = 0; i < appContent.size(); i++) {
Content c = appContent.get(i);
- String comment = "Requires " + Resource.SYMBOLIC_NAME + " " + c.getContentName() + " with attributes " + c.getAttributes();
+ String comment = "Requires " + SYMBOLIC_NAME + " " + c.getContentName() + " with attributes " + c.getAttributes();
String resolution = c.getDirective("resolution");
boolean optional = Boolean.valueOf(resolution);
- String f = ManifestHeaderProcessor.generateFilter(Resource.SYMBOLIC_NAME, c.getContentName(), c.getAttributes());
+ String f = ManifestHeaderProcessor.generateFilter(SYMBOLIC_NAME, c.getContentName(), c.getAttributes());
Filter filter;
try {
filter = FrameworkUtil.createFilter(f);
diff --git a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRBundleInfo.java b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRBundleInfo.java
index b1d9168d3..20fb408f2 100644
--- a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRBundleInfo.java
+++ b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRBundleInfo.java
@@ -137,8 +137,7 @@ public class OBRBundleInfo implements BundleInfo
return false;
}
OBRBundleInfo other = (OBRBundleInfo) obj;
- return (symbolicName.equals(other.symbolicName)
- && version.equals(other.version));
+ return symbolicName.equals(other.symbolicName) && version.equals(other.version);
}
public Attributes getRawAttributes()
diff --git a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRCapability.java b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRCapability.java
index 40b2c4295..24026fe6b 100644
--- a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRCapability.java
+++ b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/OBRCapability.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.resolver.obr.impl;
-
import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
import static org.apache.aries.application.utils.AppConstants.LOG_EXIT;
@@ -116,7 +114,7 @@ public class OBRCapability implements Capability
{
String name = entry.getKey();
String type = null;
- if (Constants.VERSION_ATTRIBUTE.equals(name) || (Constants.BUNDLE_VERSION_ATTRIBUTE.equals(name))) {
+ if (Constants.VERSION_ATTRIBUTE.equals(name) || Constants.BUNDLE_VERSION_ATTRIBUTE.equals(name)) {
type = "version";
} else if (Constants.OBJECTCLASS.equals(name) || (Constants.MANDATORY_DIRECTIVE + ":").equals(name) ||
entry.getValue() instanceof String[] || entry.getValue() instanceof Collection)
diff --git a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
index 7818d4d61..5924952b8 100644
--- a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
+++ b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
@@ -65,8 +65,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public final class RepositoryGeneratorImpl implements RepositoryGenerator
-{
+
+public final class RepositoryGeneratorImpl implements RepositoryGenerator {
private RepositoryAdmin repositoryAdmin;
private ModelledResourceManager modelledResourceManager;
private LocalPlatform tempDir;
@@ -239,7 +239,7 @@ public final class RepositoryGeneratorImpl implements RepositoryGenerator
private static String getType(String name) {
logger.debug(LOG_ENTRY, "getType", new Object[]{name});
String type = null;
- if (Constants.VERSION_ATTRIBUTE.equals(name) || (Constants.BUNDLE_VERSION_ATTRIBUTE.equals(name))) {
+ if (Constants.VERSION_ATTRIBUTE.equals(name) || Constants.BUNDLE_VERSION_ATTRIBUTE.equals(name)) {
type = "version";
} else if (Constants.OBJECTCLASS.equals(name) || MANDATORY_DIRECTIVE.equals(name))
type = "set";
diff --git a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RequirementImpl.java b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RequirementImpl.java
index ccaa3d20f..efe598ebe 100644
--- a/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RequirementImpl.java
+++ b/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RequirementImpl.java
@@ -161,7 +161,7 @@ public class RequirementImpl implements Requirement
Filter f = FrameworkUtil.createFilter(FilterUtils.removeMandatoryFilterToken(filterToCreate));
Hashtable<String, Object> hash = new Hashtable<String, Object>();
Map<String, String> props = cap.getPropertiesAsMap();
- if ((props != null) && (!!!props.isEmpty())) {
+ if ((props != null) && (!props.isEmpty())) {
for (Map.Entry<String, String> propertyPair : props.entrySet()) {
hash.put(propertyPair.getKey(), propertyPair.getValue());
}
diff --git a/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/ConfigurationPostResolveTransformerImpl.java b/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/ConfigurationPostResolveTransformerImpl.java
index 5e288c9f2..589b2c2f3 100644
--- a/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/ConfigurationPostResolveTransformerImpl.java
+++ b/application/application-resolve-transform-cm/src/main/java/org/apache/aries/application/resolve/transform/cm/ConfigurationPostResolveTransformerImpl.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.resolve.transform.cm;
import java.util.Collection;
@@ -29,8 +28,7 @@ import org.apache.aries.application.modelling.DeployedBundles;
import org.apache.aries.application.modelling.ImportedPackage;
import org.apache.aries.application.modelling.ModelledResource;
-public class ConfigurationPostResolveTransformerImpl implements PostResolveTransformer
-{
+public class ConfigurationPostResolveTransformerImpl implements PostResolveTransformer {
/*
* (non-Javadoc)
* @see org.apache.aries.application.management.spi.resolve.PostResolveTransformer#postResolveProcess(org.apache.aries.application.ApplicationMetadata, org.apache.aries.application.modelling.DeployedBundles)
@@ -86,7 +84,7 @@ public class ConfigurationPostResolveTransformerImpl implements PostResolveTrans
public String getImportPackage() throws ResolverException {
String currentImportPackage = deployedBundles.getImportPackage();
- StringBuffer rawImportPackage = new StringBuffer((currentImportPackage != null ? currentImportPackage : ""));
+ StringBuffer rawImportPackage = new StringBuffer(currentImportPackage != null ? currentImportPackage : "");
if (! rawImportPackage.toString().contains(CONFIG_PACKAGE)) {
Collection<ModelledResource> deployedContent = deployedBundles.getDeployedContent();
@@ -112,7 +110,7 @@ public class ConfigurationPostResolveTransformerImpl implements PostResolveTrans
}
}
- return (rawImportPackage.length() > 0 ? rawImportPackage.toString() : currentImportPackage);
+ return rawImportPackage.length() > 0 ? rawImportPackage.toString() : currentImportPackage;
}
public String getProvisionBundle() {
diff --git a/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java b/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
index 880382c6d..5b4dbe4d3 100644
--- a/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
+++ b/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
@@ -92,7 +92,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
public void init()
{
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized (SHARED_FRAMEWORK_LOCK) {
try {
_sharedBundleFramework = SharedBundleFramework.getSharedBundleFramework(_ctx,
_bundleFrameworkConfigurationFactory,
@@ -106,7 +106,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
public void close()
{
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
try {
_sharedBundleFramework.close();
} catch (BundleException e) {
@@ -119,7 +119,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
public BundleFramework getBundleFramework(Bundle frameworkBundle)
{
BundleFramework framework = null;
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
framework = _frameworks.get(frameworkBundle);
}
return framework;
@@ -130,7 +130,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
{
Bundle frameworkBundle = null;
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
// We need to create a new isolated framework for this content and install
// the bundles to it
BundleFramework isolatedFramework = isolatedInstall(bundlesToInstall, _sharedBundleFramework
@@ -150,7 +150,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
{
Collection<Bundle> installedBundles = new ArrayList<Bundle>();
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
// Shared bundle : Install to the shared bundle framework
for (BundleSuggestion suggestion : bundlesToInstall)
installedBundles.add(_sharedBundleFramework.install(suggestion, app));
@@ -211,14 +211,14 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
public BundleFramework getSharedBundleFramework()
{
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
return _sharedBundleFramework;
}
}
public void uninstallBundle(Bundle b) throws BundleException
{
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
BundleFramework framework = getBundleFramework(b);
if (framework != null) {
for (Bundle bundle : new ArrayList<Bundle>(framework.getBundles())) {
@@ -269,7 +269,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
public void startBundle(Bundle b) throws BundleException
{
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
BundleFramework framework = getBundleFramework(b);
// Start all bundles inside the framework
@@ -287,7 +287,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
public void stopBundle(Bundle b) throws BundleException
{
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
BundleFramework framework = getBundleFramework(b);
// Stop all bundles inside the framework
@@ -331,7 +331,7 @@ public class BundleFrameworkManagerImpl implements BundleFrameworkManager
throw new IllegalArgumentException(
"No UpdateStrategy supports the supplied DeploymentMetadata changes.");
- synchronized (BundleFrameworkManager.SHARED_FRAMEWORK_LOCK) {
+ synchronized ( SHARED_FRAMEWORK_LOCK) {
final BundleFramework appFwk = _frameworksByAppScope.get(app.getApplicationMetadata().getApplicationScope());
strategy.update(new UpdateStrategy.UpdateInfo() {
diff --git a/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedFrameworkPreResolveHook.java b/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedFrameworkPreResolveHook.java
index 6592c756f..96cfb0f64 100644
--- a/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedFrameworkPreResolveHook.java
+++ b/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedFrameworkPreResolveHook.java
@@ -138,7 +138,7 @@ public class SharedFrameworkPreResolveHook implements PreResolveHook
String value = headers.get(key);
// if (Constants.IMPORT_PACKAGE.equals(key)) {
// result.put(Constants.EXPORT_PACKAGE, value);
-// } else if (!!!Constants.EXPORT_PACKAGE.equals(key)) {
+// } else if (!Constants.EXPORT_PACKAGE.equals(key)) {
// result.put(key, value);
// }
result.put(key, value);
diff --git a/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java b/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
index 35899ecb9..2abbbcaad 100644
--- a/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
+++ b/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
@@ -153,7 +153,7 @@ public class BundleFrameworkImpl implements BundleFramework
// step 3
try {
- if (!!!waitForStartLevelChangedEventToOccur.tryAcquire(60, TimeUnit.SECONDS)) {
+ if (!waitForStartLevelChangedEventToOccur.tryAcquire(60, TimeUnit.SECONDS)) {
LOGGER.debug("Starting CBA child bundles took longer than 60 seconds");
}
} catch (InterruptedException e) {
diff --git a/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkConstants.java b/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkConstants.java
index e7945a581..5f8ce6129 100644
--- a/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkConstants.java
+++ b/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkConstants.java
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.runtime.framework.utils;
-public interface EquinoxFrameworkConstants
-{
- public static final String TRANSACTION_BUNDLE = "javax.transaction";
- public static final String TRANSACTION_BUNDLE_VERSION = "1.1.0";
- public static final String TRANSACTION_REGISTRY_BUNDLE = "javax.transaction.TransactionSynchronizationRegistry";
- public static final String COMPOSITE_SERVICE_FILTER_IMPORT = "CompositeServiceFilter-Import";
+public interface EquinoxFrameworkConstants {
+ String TRANSACTION_BUNDLE = "javax.transaction";
+ String TRANSACTION_BUNDLE_VERSION = "1.1.0";
+ String TRANSACTION_REGISTRY_BUNDLE = "javax.transaction.TransactionSynchronizationRegistry";
+ String COMPOSITE_SERVICE_FILTER_IMPORT = "CompositeServiceFilter-Import";
}
diff --git a/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkUtils.java b/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkUtils.java
index ea235f1ae..e7bc903b6 100644
--- a/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkUtils.java
+++ b/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/utils/EquinoxFrameworkUtils.java
@@ -202,9 +202,9 @@ public class EquinoxFrameworkUtils
Version maxV = vri.getMaximumVersion();
if (minV.compareTo(new Version(ve)) < 0 && maxV.compareTo(new Version(ve)) > 0) {
value = true;
- } else if (minV.compareTo(new Version(ve)) == 0 && !!!vri.isMinimumExclusive()) {
+ } else if (minV.compareTo(new Version(ve)) == 0 && !vri.isMinimumExclusive()) {
value = true;
- } else if (maxV.compareTo(new Version(ve)) == 0 && !!!vri.isMaximumExclusive()) {
+ } else if (maxV.compareTo(new Version(ve)) == 0 && !vri.isMaximumExclusive()) {
value = true;
}
}
diff --git a/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java b/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
index 479afd891..be6fc83d7 100644
--- a/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
+++ b/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.runtime.isolated.impl;
import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
@@ -24,7 +23,6 @@ import static org.apache.aries.application.utils.AppConstants.LOG_EXCEPTION;
import static org.apache.aries.application.utils.AppConstants.LOG_EXIT;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -47,27 +45,26 @@ import org.osgi.framework.BundleException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ApplicationContextManagerImpl implements AriesApplicationContextManager
-{
+public class ApplicationContextManagerImpl implements AriesApplicationContextManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationContextManagerImpl.class);
-
+
private ConcurrentMap<AriesApplication, AriesApplicationContext> _appToContextMap;
- private BundleFrameworkManager _bundleFrameworkManager;
+ private BundleFrameworkManager _bundleFrameworkManager;
private BundleRepositoryManager _bundleRepositoryManager;
public ApplicationContextManagerImpl()
{
LOGGER.debug(LOG_ENTRY, "ApplicationContextImpl");
-
+
_appToContextMap = new ConcurrentHashMap<AriesApplication, AriesApplicationContext>();
-
+
// When doing isolated runtime support provisioning against the local repo is a really bad idea
// it can result in trying to install things into the shared framework into the local framework
// this doesn't work because we don't know how to install them into the shared framework and
// we can't just use them because they are in the local framework, so if this class is constructed
// we disable local provisioning.
System.setProperty(AppConstants.PROVISON_EXCLUDE_LOCAL_REPO_SYSPROP, "true");
-
+
LOGGER.debug(LOG_EXIT, "ApplicationContextImpl", this);
}
@@ -75,28 +72,28 @@ public class ApplicationContextManagerImpl implements AriesApplicationContextMan
{
_bundleFrameworkManager = bfm;
}
-
+
public void setBundleRepositoryManager(BundleRepositoryManager brm)
{
LOGGER.debug(LOG_ENTRY, "setBundleRepositoryManager", brm);
LOGGER.debug(LOG_EXIT, "setBundleRepositoryManager");
-
+
this._bundleRepositoryManager = brm;
}
-
+
public BundleRepositoryManager getBundleRepositoryManager()
{
LOGGER.debug(LOG_ENTRY, "getBundleRepositoryManager");
LOGGER.debug(LOG_EXIT, "getBundleRepositoryManager", _bundleRepositoryManager);
-
+
return _bundleRepositoryManager;
}
-
+
public synchronized AriesApplicationContext getApplicationContext(AriesApplication app)
throws BundleException, ManagementException
{
LOGGER.debug(LOG_ENTRY, "getApplicationContext", app);
-
+
AriesApplicationContext result;
if (_appToContextMap.containsKey(app)) {
result = _appToContextMap.get(app);
@@ -107,32 +104,32 @@ public class ApplicationContextManagerImpl implements AriesApplicationContextMan
result = previous;
}
}
-
+
LOGGER.debug(LOG_EXIT, "getApplicationContext", result);
-
+
return result;
}
public synchronized Set<AriesApplicationContext> getApplicationContexts()
{
LOGGER.debug(LOG_ENTRY, "getApplicationContexts");
-
+
Set<AriesApplicationContext> result = new HashSet<AriesApplicationContext>();
for (Map.Entry<AriesApplication, AriesApplicationContext> entry : _appToContextMap.entrySet()) {
result.add(entry.getValue());
}
-
+
LOGGER.debug(LOG_EXIT, "getApplicationContexts", result);
-
+
return result;
}
public void remove(AriesApplicationContext app) throws BundleException
{
LOGGER.debug(LOG_ENTRY, "remove", app);
-
+
ApplicationContextImpl appToRemove = null;
- synchronized (_appToContextMap) {
+ synchronized (_appToContextMap) {
Iterator<Map.Entry<AriesApplication, AriesApplicationContext>> it = _appToContextMap.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<AriesApplication, AriesApplicationContext> entry = it.next();
@@ -144,74 +141,74 @@ public class ApplicationContextManagerImpl implements AriesApplicationContextMan
}
}
}
-
- if (appToRemove != null) {
+
+ if (appToRemove != null) {
appToRemove.uninstall();
}
LOGGER.debug(LOG_EXIT, "remove");
}
-
+
public void close()
{
LOGGER.debug(LOG_ENTRY, "close");
-
+
List<ApplicationContextImpl> contextsToUninstall = new ArrayList<ApplicationContextImpl>();
- synchronized (_appToContextMap) {
+ synchronized (_appToContextMap) {
Iterator<AriesApplicationContext> it = _appToContextMap.values().iterator();
- while (it.hasNext()) {
+ while (it.hasNext()) {
ApplicationContextImpl ctx = (ApplicationContextImpl)it.next();
- if (ctx.getApplicationState() != ApplicationState.UNINSTALLED) {
+ if (ctx.getApplicationState() != ApplicationState.UNINSTALLED) {
contextsToUninstall.add(ctx);
it.remove();
}
}
}
- for (ApplicationContextImpl c : contextsToUninstall) {
- try {
+ for (ApplicationContextImpl c : contextsToUninstall) {
+ try {
c.uninstall();
} catch (BundleException e)
{
LOGGER.debug(LOG_EXCEPTION,e);
}
}
-
+
LOGGER.debug(LOG_EXIT, "close");
}
-
+
protected BundleFrameworkManager getBundleFrameworkManager()
{
LOGGER.debug(LOG_ENTRY, "getBundleFrameworkManager");
LOGGER.debug(LOG_EXIT, "getBundleFrameworkManager", _bundleFrameworkManager);
-
+
return _bundleFrameworkManager;
}
public AriesApplicationContext update(AriesApplication app, DeploymentMetadata oldMetadata) throws UpdateException {
ApplicationContextImpl ctx = (ApplicationContextImpl)_appToContextMap.get(app);
-
+
if (ctx == null) {
throw new IllegalArgumentException("AriesApplication "+
- app.getApplicationMetadata().getApplicationSymbolicName() + "/" + app.getApplicationMetadata().getApplicationVersion() +
+ app.getApplicationMetadata().getApplicationSymbolicName() + "/" + app.getApplicationMetadata().getApplicationVersion() +
" cannot be updated because it is not installed");
}
-
+
ctx.update(app.getDeploymentMetadata(), oldMetadata);
-
+
return ctx;
}
public void bindBundleFrameworkManager(BundleFrameworkManager bfm)
{
LOGGER.debug(LOG_ENTRY, "bindBundleFrameworkManager", bfm);
-
+
List<AriesApplicationContext> contexts = new ArrayList<AriesApplicationContext>();
- synchronized (_appToContextMap) {
+ synchronized (_appToContextMap) {
contexts.addAll (_appToContextMap.values());
}
-
- for (AriesApplicationContext ctx : contexts) {
- try {
+
+ for (AriesApplicationContext ctx : contexts) {
+ try {
((ApplicationContextImpl)ctx).open();
} catch (BundleException e) {
LOGGER.debug(LOG_EXCEPTION,e);
@@ -223,19 +220,19 @@ public class ApplicationContextManagerImpl implements AriesApplicationContextMan
public void unbindBundleFrameworkManager(BundleFrameworkManager bfm)
{
LOGGER.debug(LOG_ENTRY, "unbindBundleFrameworkManager", bfm);
-
+
List<AriesApplicationContext> appContexts = new ArrayList<AriesApplicationContext>();
- synchronized (_appToContextMap) {
+ synchronized (_appToContextMap) {
appContexts.addAll(_appToContextMap.values());
}
- for (AriesApplicationContext c : appContexts) {
- try {
+ for (AriesApplicationContext c : appContexts) {
+ try {
((ApplicationContextImpl)c).close();
- } catch (BundleException e) {
+ } catch (BundleException e) {
LOGGER.debug(LOG_EXCEPTION,e);
}
}
-
+
LOGGER.debug(LOG_EXIT, "unbindBundleFrameworkManager");
}
}
\ No newline at end of file
diff --git a/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java b/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
index 796af3c8a..826c5145e 100644
--- a/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
+++ b/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
@@ -144,7 +144,7 @@ public class BundleRepositoryManagerImpl implements BundleRepositoryManager
BundleSuggestion suggestion = null;
- if (!!!bundlesuggestions.isEmpty()) {
+ if (!bundlesuggestions.isEmpty()) {
List<BundleSuggestion> thoughts = bundlesuggestions.get(bundleToFind.getExactVersion());
diff --git a/application/application-tooling-repository-generator/src/main/java/org/apache/aries/application/repository/generator/AriesRepositoryGenerator.java b/application/application-tooling-repository-generator/src/main/java/org/apache/aries/application/repository/generator/AriesRepositoryGenerator.java
index f05d3eff7..f612e7f35 100644
--- a/application/application-tooling-repository-generator/src/main/java/org/apache/aries/application/repository/generator/AriesRepositoryGenerator.java
+++ b/application/application-tooling-repository-generator/src/main/java/org/apache/aries/application/repository/generator/AriesRepositoryGenerator.java
@@ -65,7 +65,7 @@ public class AriesRepositoryGenerator {
Iterator<FrameworkFactory> factoryIterator = factoryLoader.iterator();
//Map<String, String> osgiPropertyMap = new HashMap<String, String>();
- if (!!!factoryIterator.hasNext()) {
+ if (!factoryIterator.hasNext()) {
System.out.println( "Unable to locate the osgi jar");
}
@@ -83,7 +83,7 @@ public class AriesRepositoryGenerator {
File[] jars = bundleDir.listFiles();
try {
for (File jar : jars) {
- if (jar.isFile() && (jar.getName().endsWith(".jar"))) {
+ if (jar.isFile() && jar.getName().endsWith(".jar")) {
String location = URLDecoder.decode(jar.toURI().toURL().toExternalForm(), "UTF-8");
if (shouldInstall(location, getIgnoreList())) {
installedBundles.add(framework.getBundleContext().installBundle(
@@ -113,7 +113,7 @@ public class AriesRepositoryGenerator {
for (Bundle bundle : installedBundles) {
try {
if (bundle.getHeaders().get(Constants.FRAGMENT_HOST) == null) {
- //start the bundle using its activiation policy
+ //start the bundle using its activation policy
bundle.start(Bundle.START_ACTIVATION_POLICY);
} else {
//nothing to start, we have got a fragment
@@ -198,7 +198,7 @@ public class AriesRepositoryGenerator {
xmlFile = new File(args[0]);
// get the directors
File parentDir = xmlFile.getAbsoluteFile().getParentFile();
- if (!!!parentDir.exists()) {
+ if (!parentDir.exists()) {
parentDir.mkdirs();
}
@@ -252,7 +252,7 @@ public class AriesRepositoryGenerator {
break;
}
}
- return !!!inIgnoreList;
+ return !inIgnoreList;
}
private List<String> getIgnoreList() {
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataFactoryImpl.java b/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataFactoryImpl.java
index 22a072025..f4b7a5244 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataFactoryImpl.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataFactoryImpl.java
@@ -25,7 +25,6 @@ import java.util.jar.Manifest;
import org.apache.aries.application.ApplicationMetadata;
import org.apache.aries.application.ApplicationMetadataFactory;
import org.apache.aries.util.manifest.ManifestProcessor;
-import org.osgi.framework.Version;
public class ApplicationMetadataFactoryImpl implements ApplicationMetadataFactory
{
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java b/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
index 84d1d4172..beeadad2e 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
@@ -223,7 +223,7 @@ public int hashCode()
public void store(OutputStream out) throws IOException {
if (manifest != null) {
Attributes att = manifest.getMainAttributes();
- if ((att.getValue(Attributes.Name.MANIFEST_VERSION.toString())) == null) {
+ if (att.getValue(Attributes.Name.MANIFEST_VERSION.toString()) == null) {
att.putValue(Attributes.Name.MANIFEST_VERSION.toString(), AppConstants.MANIFEST_VERSION);
}
manifest.write(out);
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/impl/ContentImpl.java b/application/application-utils/src/main/java/org/apache/aries/application/impl/ContentImpl.java
index e8f7a0ba5..fc9b4cab5 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/impl/ContentImpl.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/impl/ContentImpl.java
@@ -149,7 +149,7 @@ public final class ContentImpl implements Content
builder.append(this.contentName);
- if (!!!nameValueMap.isEmpty()) {
+ if (!nameValueMap.isEmpty()) {
for (Map.Entry<String, String> entry : nameValueMap.entrySet()) {
builder.append(';');
builder.append(entry.getKey());
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java b/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
index 6ee9507c8..a61fe06e7 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
@@ -155,10 +155,10 @@ public class DeploymentMetadataImpl implements DeploymentMetadata {
Collection<String> customKeys = new HashSet<String>();
Collection<Attributes.Name> standardKeys = getDeploymentStandardHeaders();
- if ((attrs != null) && (!!!attrs.isEmpty())) {
+ if ((attrs != null) && (!attrs.isEmpty())) {
Set<Object> keys = attrs.keySet();
- if ((keys != null) && (!!!keys.isEmpty())) {
+ if ((keys != null) && (!keys.isEmpty())) {
for (Object eachKey : keys) {
String key = eachKey.toString();
customKeys.add(key);
@@ -175,7 +175,7 @@ public class DeploymentMetadataImpl implements DeploymentMetadata {
StringBuilder builder = new StringBuilder();
boolean beginning = true;
for (Content c : contents) {
- if (!!!beginning) {
+ if (!beginning) {
builder.append(",");
}
builder.append(c);
@@ -231,11 +231,11 @@ public class DeploymentMetadataImpl implements DeploymentMetadata {
if ((_deploymentImportPackage != null) && (!_deploymentImportPackage.isEmpty())) {
attributes.putValue(AppConstants.DEPLOYMENT_IMPORT_PACKAGES, getContentsAsString(_deploymentImportPackage));
}
- if ((_deployedImportService != null) && (!!!_deployedImportService.isEmpty())) {
+ if ((_deployedImportService != null) && (!_deployedImportService.isEmpty())) {
attributes.putValue(AppConstants.DEPLOYMENTSERVICE_IMPORT, convertFiltersToString(_deployedImportService, ",") );
}
// let's write out the custom headers
- if ((_deploymentCustomEntries != null) && (_deploymentCustomEntries.isEmpty())) {
+ if (_deploymentCustomEntries != null && _deploymentCustomEntries.isEmpty()) {
for (Map.Entry<String, String> customEntry : _deploymentCustomEntries.entrySet()) {
attributes.putValue(customEntry.getKey(), customEntry.getValue());
}
@@ -311,7 +311,7 @@ public class DeploymentMetadataImpl implements DeploymentMetadata {
private Map<String, String> getCustomEntries(Attributes attrs) {
Map<String, String> customEntry = new HashMap<String, String> ();
Collection<String> customHeaders = getCustomHeaders(attrs);
- if ((customHeaders != null) && (customHeaders.isEmpty())) {
+ if (customHeaders != null && customHeaders.isEmpty()) {
for (String customHeader : customHeaders)
customEntry.put(customHeader, attrs.getValue(customHeader));
@@ -323,7 +323,7 @@ public class DeploymentMetadataImpl implements DeploymentMetadata {
private Collection<Filter> getFilters(String filterString) throws InvalidAttributeException{
Collection<Filter> filters = new ArrayList<Filter>();
List<String> fs = ManifestProcessor.split(filterString, ",");
- if ((fs != null) && (!!!fs.isEmpty())) {
+ if ((fs != null) && (!fs.isEmpty())) {
for (String filter : fs) {
try {
filters.add(FrameworkUtil.createFilter(FilterUtils.removeMandatoryFilterToken(filter)));
@@ -338,7 +338,7 @@ public class DeploymentMetadataImpl implements DeploymentMetadata {
private String convertFiltersToString(Collection<Filter> contents, String separator) {
StringBuilder newContent = new StringBuilder();
- if ((contents != null) && (!!!contents.isEmpty())) {
+ if ((contents != null) && (!contents.isEmpty())) {
boolean beginning = true;
for (Filter content: contents) {
if (beginning)
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java b/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java
index feb84cdef..3fcec7205 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java
@@ -18,73 +18,71 @@
*/
package org.apache.aries.application.utils;
-
/**
* Widely used constants in parsing Aries applications
*/
-public interface AppConstants
-{
+public interface AppConstants {
/** Trace group for this bundle */
- public String TRACE_GROUP = "Aries.app.utils";
+ String TRACE_GROUP = "Aries.app.utils";
/** The Manifest version */
- public static final String APPLICATION_MANIFEST_VERSION="Manifest-Version";
+ String APPLICATION_MANIFEST_VERSION="Manifest-Version";
/** The application scope (used to find the applications bundle repository */
- public static final String APPLICATION_SCOPE = "Application-Scope";
+ String APPLICATION_SCOPE = "Application-Scope";
/** The application content directive for the application manifest */
- public static final String APPLICATION_CONTENT = "Application-Content";
+ String APPLICATION_CONTENT = "Application-Content";
/** The application version directive for the application manifest */
- public static final String APPLICATION_VERSION = "Application-Version";
+ String APPLICATION_VERSION = "Application-Version";
/** The application name directive for the application manifest */
- public static final String APPLICATION_NAME = "Application-Name";
+ String APPLICATION_NAME = "Application-Name";
/** The application symbolic name directive for the application manifest */
- public static final String APPLICATION_SYMBOLIC_NAME = "Application-SymbolicName";
+ String APPLICATION_SYMBOLIC_NAME = "Application-SymbolicName";
/** The default version for applications that do not have one */
- public static final String DEFAULT_VERSION = "0.0.0";
+ String DEFAULT_VERSION = "0.0.0";
/** The name of the application manifest in the application */
- public static final String APPLICATION_MF = "META-INF/APPLICATION.MF";
+ String APPLICATION_MF = "META-INF/APPLICATION.MF";
/** The name of the deployment manifest in the application */
- public static final String DEPLOYMENT_MF = "META-INF/DEPLOYMENT.MF";
+ String DEPLOYMENT_MF = "META-INF/DEPLOYMENT.MF";
/** The name of the META-INF directory */
- public static final String META_INF = "META-INF";
+ String META_INF = "META-INF";
/** The name of an application.xml file which will be used in processing legacy .war files */
- public static final String APPLICATION_XML = "META-INF/application.xml";
+ String APPLICATION_XML = "META-INF/application.xml";
/** The expected lower case suffix of a jar file */
- public static final String LOWER_CASE_JAR_SUFFIX = ".jar";
+ String LOWER_CASE_JAR_SUFFIX = ".jar";
/** The expected lower case suffix of a war file */
- public static final String LOWER_CASE_WAR_SUFFIX = ".war";
+ String LOWER_CASE_WAR_SUFFIX = ".war";
/** The attribute used to record the deployed version of a bundle */
- public static final String DEPLOYMENT_BUNDLE_VERSION = "deployed-version";
+ String DEPLOYMENT_BUNDLE_VERSION = "deployed-version";
/** The name of the bundle manifest */
- public static final String MANIFEST_MF = "META-INF/MANIFEST.MF";
+ String MANIFEST_MF = "META-INF/MANIFEST.MF";
- public static final String MANIFEST_VERSION="1.0";
+ String MANIFEST_VERSION="1.0";
/** The application import service directive for the application manifest */
- public static final String APPLICATION_IMPORT_SERVICE = "Application-ImportService";
+ String APPLICATION_IMPORT_SERVICE = "Application-ImportService";
/** The application export service directive for the application manifest */
- public static final String APPLICATION_EXPORT_SERVICE = "Application-ExportService";
+ String APPLICATION_EXPORT_SERVICE = "Application-ExportService";
/** The use-bundle entry for the application manifest. */
- public static final String APPLICATION_USE_BUNDLE = "Use-Bundle";
+ String APPLICATION_USE_BUNDLE = "Use-Bundle";
/* The Deployed-Content header in DEPLOYMENT.MF records all the bundles
* to be deployed for a particular application.
*/
- public static final String DEPLOYMENT_CONTENT = "Deployed-Content";
+ String DEPLOYMENT_CONTENT = "Deployed-Content";
/** deployment.mf entry corresponding to application.mf Use-Bundle. */
- public static final String DEPLOYMENT_USE_BUNDLE = "Deployed-Use-Bundle";
+ String DEPLOYMENT_USE_BUNDLE = "Deployed-Use-Bundle";
/** deployment.mf entry 'Import-Package' */
- public static final String DEPLOYMENT_IMPORT_PACKAGES="Import-Package";
+ String DEPLOYMENT_IMPORT_PACKAGES="Import-Package";
/** Bundle dependencies required by bundles listed in Deployed-Content or Deployed-Use-Bundle. */
- public static final String DEPLOYMENT_PROVISION_BUNDLE = "Provision-Bundle";
+ String DEPLOYMENT_PROVISION_BUNDLE = "Provision-Bundle";
/** Blueprint managed services imported by the isolated bundles */
- public static final String DEPLOYMENTSERVICE_IMPORT = "DeployedService-Import";
+ String DEPLOYMENTSERVICE_IMPORT = "DeployedService-Import";
- public static final String PROVISON_EXCLUDE_LOCAL_REPO_SYSPROP="provision.exclude.local.repository";
+ String PROVISON_EXCLUDE_LOCAL_REPO_SYSPROP="provision.exclude.local.repository";
/**
* Logging insert strings
*/
- public final static String LOG_ENTRY = "Method entry: {}, args {}";
- public final static String LOG_EXIT = "Method exit: {}, returning {}";
- public final static String LOG_EXCEPTION = "Caught exception";
+ String LOG_ENTRY = "Method entry: {}, args {}";
+ String LOG_EXIT = "Method exit: {}, returning {}";
+ String LOG_EXCEPTION = "Caught exception";
}
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java b/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
index b5940721a..3bb4a32cf 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.utils.management;
import java.util.HashMap;
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ExportedServiceHelper.java b/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ExportedServiceHelper.java
index 2d6e64ae4..ee9a873e7 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ExportedServiceHelper.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ExportedServiceHelper.java
@@ -1,8 +1,5 @@
package org.apache.aries.application.utils.service;
-import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
-import static org.apache.aries.application.utils.AppConstants.LOG_EXIT;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
diff --git a/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ServiceCollection.java b/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ServiceCollection.java
index a713897ab..f3a88135d 100644
--- a/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ServiceCollection.java
+++ b/application/application-utils/src/main/java/org/apache/aries/application/utils/service/ServiceCollection.java
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.utils.service;
import java.util.Collection;
import org.osgi.framework.ServiceReference;
-public interface ServiceCollection<E> extends Collection<E>
-{
- public void addService(ServiceReference ref);
+public interface ServiceCollection<E> extends Collection<E> {
+ void addService(ServiceReference ref);
}
\ No newline at end of file
diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java
index e88eb5fae..8e4eed250 100644
--- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java
+++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/fixture/ArchiveFixture.java
@@ -419,7 +419,7 @@ public class ArchiveFixture
String dirName = "";
for (int i=0;i<parts.length-1;i++) {
dirName += parts[i] + "/";
- if (!!!existingDirs.contains(dirName)) {
+ if (!existingDirs.contains(dirName)) {
ZipEntry ze = new ZipEntry(dirName);
zout.putNextEntry(ze);
zout.closeEntry();
diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/MethodCall.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/MethodCall.java
index 185f9c074..89b112b04 100644
--- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/MethodCall.java
+++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/MethodCall.java
@@ -369,7 +369,7 @@ public final class MethodCall
if (result == 0) continue;
else if (result == 1) return false;
- else if (!!!this._arguments[i].equals(other._arguments[i])) return false;
+ else if (!this._arguments[i].equals(other._arguments[i])) return false;
}
}
}
@@ -405,7 +405,7 @@ public final class MethodCall
((AtomicInteger)arr1[k]).intValue() == ((AtomicInteger)arr2[k]).intValue())
continue;
- if (!!!arr1[k].equals(arr2[k])) return false;
+ if (!arr1[k].equals(arr2[k])) return false;
}
diff --git a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java
index 4dc71be9b..02d7bbcd4 100644
--- a/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java
+++ b/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/mocks/Skeleton.java
@@ -491,7 +491,7 @@ public final class Skeleton implements InvocationHandler
Method[] methods = clazz.getMethods();
methods: for (Method m : methods) {
- if(!!!m.getName().equals(call.getMethodName()))
+ if(!m.getName().equals(call.getMethodName()))
continue methods;
Object[] args = call.getArguments();
@@ -518,7 +518,7 @@ public final class Skeleton implements InvocationHandler
else if (returnType == double.class) returnType = Double.class;
}
- if (value != null && !!!returnType.isInstance(value)) {
+ if (value != null && !returnType.isInstance(value)) {
throw new IllegalArgumentException("The object cannot be returned by the requested method: " + call);
} else break methods;
}