Upgrade OSGI annotations to 6.0.0 version

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to AET will be documented in this file.
 ## Unreleased
 **List of changes that are finished but not yet released in any final version.**
 
+- [PR-326](https://github.com/Cognifide/aet/pull/326) ([PR-308](https://github.com/Cognifide/aet/pull/308), [PR-310](https://github.com/Cognifide/aet/pull/310), [PR-311](https://github.com/Cognifide/aet/pull/311), [PR-312](https://github.com/Cognifide/aet/pull/312), [PR-313](https://github.com/Cognifide/aet/pull/313), [PR-314](https://github.com/Cognifide/aet/pull/314), [PR-315](https://github.com/Cognifide/aet/pull/315), [PR-316](https://github.com/Cognifide/aet/pull/316), [PR-322](https://github.com/Cognifide/aet/pull/322)) - updated OSGi annotations to 6.0.0 OSGi standard
 - [PR-293](https://github.com/Cognifide/aet/pull/293) Added error treshold in pixels and percentages for screen comparator
 - [PR-300](https://github.com/Cognifide/aet/pull/300) Added creating indexes for collection
 - [PR-289](https://github.com/Cognifide/aet/pull/289) User now stays on the same tab while navigating between URLs

core/cleaner/pom.xml

@@ -56,8 +56,16 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr.annotations</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component.annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -71,10 +79,6 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-osgi</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.configadmin</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
@@ -87,10 +91,6 @@
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.osgi</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

core/cleaner/src/main/java/com/cognifide/aet/cleaner/CleanerScheduler.java

@@ -15,22 +15,20 @@
  */
 package com.cognifide.aet.cleaner;
 
+import com.cognifide.aet.cleaner.configuration.CleanerSchedulerConf;
 import com.cognifide.aet.cleaner.route.MetadataCleanerRouteBuilder;
 import com.cognifide.aet.cleaner.validation.CleanerSchedulerValidator;
 import com.cognifide.aet.validation.ValidationResultBuilder;
 import com.cognifide.aet.validation.ValidationResultBuilderFactory;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
-import java.util.Map;
 import java.util.UUID;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.Designate;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.JobBuilder;
 import org.quartz.JobDataMap;
@@ -44,47 +42,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(CleanerScheduler.class)
-@Component(immediate = true, metatype = true, label = "AET Cleaning Scheduler Service", policy = ConfigurationPolicy.REQUIRE, configurationFactory = true)
+@Component(
+    service = CleanerScheduler.class,
+    immediate = true,
+    configurationPolicy = ConfigurationPolicy.REQUIRE)
+@Designate(ocd = CleanerSchedulerConf.class, factory = true)
 public class CleanerScheduler {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(CleanerScheduler.class);
 
-  private static final String COMPANY_NAME = "companyName";
-
-  private static final String PROJECT_NAME = "projectName";
-
-  private static final String REMOVE_OLDER_THAN = "removeOlderThan";
-
-  private static final String KEEP_N_VERSIONS = "keepNVersions";
-
-  private static final String SCHEDULE_CRON = "schedule";
-
-  private static final String DRY_RUN = "dryRun";
-
-  private static final long DEFAULT_REMOVE_OLDER_THAN_PARAM = 10L;
-
-  private static final long DEFAULT_KEEP_N_VERSIONS_PARAM = 1L;
-
   private Scheduler scheduler;
 
-  @Property(name = SCHEDULE_CRON, label = "Schedule", description = "CRON notation of when the job is to be fired. [example: '0 0 21 ? * *' will trigger job daily at 21:00].")
-  private String schedule;
-
-  @Property(name = KEEP_N_VERSIONS, label = "Last versions to keep", description = "Defines number of artifacts versions that will be left after clean operation [integer]. If left empty, only one version will be kept after cleaning operation.", longValue = DEFAULT_KEEP_N_VERSIONS_PARAM)
-  private Long keepNVersions;
-
-  @Property(name = REMOVE_OLDER_THAN, label = "Remove artifacts older than", description = "Defines how old files should be removed [integer days]. Works as conjunction with last versions to keep.", longValue = DEFAULT_REMOVE_OLDER_THAN_PARAM)
-  private Long removeOlderThan;
-
-  @Property(name = COMPANY_NAME, label = "Company Name", description = "Name of the company for which we wish cleaning to be performed. Leave blank if you wish to trigger this job for each company on database.")
-  private String companyName;
-
-  @Property(name = PROJECT_NAME, label = "Project Name", description = "Name of the project for which we wish cleaning to be performed. Leave blank if you wish to trigger this job for each project on database.")
-  private String projectName;
-
-  @Property(name = DRY_RUN, label = "Dry run", description = "Flag that says if operation should be run in 'dry run' mode. When checked, no changes will be performed on database.", boolValue = true)
-  private Boolean dryRun;
+  private CleanerSchedulerConf config;
 
   @Reference
   private MetadataCleanerRouteBuilder metadataCleanerRouteBuilder;
@@ -98,21 +67,14 @@ public class CleanerScheduler {
   private String scheduledJob;
 
   @Activate
-  public void activate(Map<String, ?> properties) {
+  public void activate(CleanerSchedulerConf config) {
     LOGGER.info("Activating CleanerScheduler.");
     try {
-      schedule = PropertiesUtil.toString(properties.get(SCHEDULE_CRON), null);
-      removeOlderThan = PropertiesUtil
-          .toLong(properties.get(REMOVE_OLDER_THAN), DEFAULT_REMOVE_OLDER_THAN_PARAM);
-      keepNVersions = PropertiesUtil
-          .toLong(properties.get(KEEP_N_VERSIONS), DEFAULT_KEEP_N_VERSIONS_PARAM);
-      companyName = PropertiesUtil.toString(properties.get(COMPANY_NAME), "");
-      projectName = PropertiesUtil.toString(properties.get(PROJECT_NAME), "");
-      dryRun = PropertiesUtil.toBoolean(properties.get(DRY_RUN), true);
+      this.config = config;
 
       ValidationResultBuilder validationResultBuilder = validationResultBuilderFactory
           .createInstance();
-      new CleanerSchedulerValidator(schedule, keepNVersions, removeOlderThan)
+      new CleanerSchedulerValidator(config.schedule(), config.keepNVersions(), config.removeOlderThan())
           .validate(validationResultBuilder);
       if (!validationResultBuilder.hasErrors()) {
         scheduler = StdSchedulerFactory.getDefaultScheduler();
@@ -156,11 +118,11 @@ private String registerCleaningJob() throws SchedulerException {
 
     final ImmutableMap<String, Object> jobData = ImmutableMap.<String, Object>builder()
         .put(CleanerJob.KEY_ROUTE_BUILDER, metadataCleanerRouteBuilder)
-        .put(CleanerJob.KEY_KEEP_N_VERSIONS, keepNVersions)
-        .put(CleanerJob.KEY_REMOVE_OLDER_THAN, removeOlderThan)
-        .put(CleanerJob.KEY_COMPANY_FILTER, companyName)
-        .put(CleanerJob.KEY_PROJECT_FILTER, projectName)
-        .put(CleanerJob.KEY_DRY_RUN, dryRun)
+        .put(CleanerJob.KEY_KEEP_N_VERSIONS, config.keepNVersions())
+        .put(CleanerJob.KEY_REMOVE_OLDER_THAN, config.removeOlderThan())
+        .put(CleanerJob.KEY_COMPANY_FILTER, config.companyName())
+        .put(CleanerJob.KEY_PROJECT_FILTER, config.projectName())
+        .put(CleanerJob.KEY_DRY_RUN, config.dryRun())
         .build();
 
     JobDetail jobDetail = JobBuilder.newJob(CleanerJob.class)
@@ -170,7 +132,7 @@ private String registerCleaningJob() throws SchedulerException {
 
     Trigger trigger = TriggerBuilder.newTrigger()
         .withIdentity(cleanerTriggerName)
-        .withSchedule(CronScheduleBuilder.cronSchedule(schedule))
+        .withSchedule(CronScheduleBuilder.cronSchedule(config.schedule()))
         .build();
 
     scheduler.scheduleJob(jobDetail, trigger);
@@ -180,12 +142,12 @@ private String registerCleaningJob() throws SchedulerException {
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
-        .add("schedule", schedule)
-        .add("keepNVersions", keepNVersions)
-        .add("removeOlderThan", removeOlderThan)
-        .add("companyName", companyName)
-        .add("projectName", projectName)
-        .add("dryRun", dryRun)
+        .add("schedule", config.schedule())
+        .add("keepNVersions", config.keepNVersions())
+        .add("removeOlderThan", config.removeOlderThan())
+        .add("companyName", config.companyName())
+        .add("projectName", config.projectName())
+        .add("dryRun", config.dryRun())
         .toString();
   }
 }

core/cleaner/src/main/java/com/cognifide/aet/cleaner/configuration/CleanerSchedulerConf.java

@@ -0,0 +1,77 @@
+/**
+ * AET
+ *
+ * Copyright (C) 2013 Cognifide Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.cognifide.aet.cleaner.configuration;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.AttributeType;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition(name = "AET Cleaning Scheduler Service", description = "AET Cleaning Scheduler Service")
+public @interface CleanerSchedulerConf {
+
+  String COMPANY_NAME = "Company Name";
+
+  String PROJECT_NAME = "Project Name";
+
+  String REMOVE_OLDER_THAN = "Remove artifacts older than";
+
+  String KEEP_N_VERSIONS = "Last versions to keep";
+
+  String SCHEDULE_CRON = "Schedule";
+
+  String DRY_RUN = "Dry run";
+
+  long DEFAULT_REMOVE_OLDER_THAN_PARAM = 10L;
+
+  long DEFAULT_KEEP_N_VERSIONS_PARAM = 1L;
+
+  @AttributeDefinition(
+      name = SCHEDULE_CRON,
+      description = "CRON notation of when the job is to be fired. [example: '0 0 21 ? * *' will trigger job daily at 21:00].")
+  String schedule();
+
+  @AttributeDefinition(
+      name = KEEP_N_VERSIONS,
+      description = "Defines number of artifacts versions that will be left after clean operation [integer]. If left empty, only one version will be kept after cleaning operation.",
+      type = AttributeType.LONG)
+  long keepNVersions() default DEFAULT_KEEP_N_VERSIONS_PARAM;
+
+  @AttributeDefinition(
+      name = REMOVE_OLDER_THAN,
+      description = "Defines how old files should be removed [integer days]. Works as conjunction with last versions to keep.",
+      type = AttributeType.LONG)
+  long removeOlderThan() default DEFAULT_REMOVE_OLDER_THAN_PARAM;
+
+  @AttributeDefinition(
+      name = COMPANY_NAME,
+      description = "Name of the company for which we wish cleaning to be performed. Leave blank if you wish to trigger this job for each company on database.",
+      type = AttributeType.STRING)
+  String companyName();
+
+  @AttributeDefinition(
+      name = PROJECT_NAME,
+      description = "Name of the project for which we wish cleaning to be performed. Leave blank if you wish to trigger this job for each project on database.",
+      type = AttributeType.STRING)
+  String projectName();
+
+  @AttributeDefinition(
+      name = DRY_RUN,
+      description = "Flag that says if operation should be run in 'dry run' mode. When checked, no changes will be performed on database.",
+      type = AttributeType.BOOLEAN)
+  boolean dryRun() default true;
+
+
+}

core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/FetchAllProjectSuitesProcessor.java

@@ -29,14 +29,12 @@
 import java.util.Map;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(FetchAllProjectSuitesProcessor.class)
-@Component
+@Component(service = FetchAllProjectSuitesProcessor.class)
 public class FetchAllProjectSuitesProcessor implements Processor {
 
   private static final Logger LOGGER = LoggerFactory

core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/GetMetadataArtifactsProcessor.java

@@ -34,13 +34,11 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(GetMetadataArtifactsProcessor.class)
-@Component
+@Component(service = GetMetadataArtifactsProcessor.class)
 public class GetMetadataArtifactsProcessor implements Processor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(GetMetadataArtifactsProcessor.class);

core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/RemoveArtifactsProcessor.java

@@ -21,14 +21,12 @@
 import com.google.common.collect.Sets;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(RemoveArtifactsProcessor.class)
-@Component
+@Component(service = RemoveArtifactsProcessor.class)
 public class RemoveArtifactsProcessor implements Processor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(RemoveArtifactsProcessor.class);

core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/RemoveMetadataProcessor.java

@@ -21,14 +21,12 @@
 import com.cognifide.aet.vs.MetadataDAO;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(RemoveMetadataProcessor.class)
-@Component
+@Component(service = RemoveMetadataProcessor.class)
 public class RemoveMetadataProcessor implements Processor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(RemoveMetadataProcessor.class);

core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/StartMetadataCleanupProcessor.java

@@ -26,17 +26,15 @@
 import java.util.Collection;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Query for all databases and passes them to split.
  */
-@Service(StartMetadataCleanupProcessor.class)
-@Component
+@Component(service = StartMetadataCleanupProcessor.class)
 public class StartMetadataCleanupProcessor implements Processor {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(StartMetadataCleanupProcessor.class);

core/cleaner/src/main/java/com/cognifide/aet/cleaner/processors/SuitesRemovePredicateProcessor.java

@@ -28,13 +28,11 @@
 import java.util.Collection;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Service(SuitesRemovePredicateProcessor.class)
-@Component
+@Component(service = SuitesRemovePredicateProcessor.class)
 public class SuitesRemovePredicateProcessor implements Processor {
 
   private static final Logger LOGGER = LoggerFactory