Merge pull request #1027 from ZakarFin/remove-kapa

Remove unused code/imports / KaPa statistical data adapter

pom.xml

@@ -260,11 +260,6 @@
                 <artifactId>service-statistics-sotka</artifactId>
                 <version>${oskari.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.oskari</groupId>
-                <artifactId>service-statistics-kapa</artifactId>
-                <version>${oskari.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.oskari</groupId>
                 <artifactId>service-statistics-pxweb</artifactId>
@@ -1218,7 +1213,6 @@
         <module>service-statistics-common</module>
         <module>service-statistics</module>
         <module>service-statistics-sotka</module>
-        <module>service-statistics-kapa</module>
         <module>service-statistics-eurostat</module>
         <module>service-statistics-pxweb</module>
         <module>service-statistics-unsd</module>

service-statistics-common/src/main/java/fi/nls/oskari/control/statistics/data/IndicatorSet.java

@@ -1,7 +1,5 @@
 package fi.nls.oskari.control.statistics.data;
 
-import fi.nls.oskari.control.statistics.data.StatisticalIndicator;
-
 import java.util.Collections;
 import java.util.List;
 

service-statistics-common/src/main/java/fi/nls/oskari/control/statistics/data/StatisticalIndicatorDataDimension.java

@@ -1,6 +1,5 @@
 package fi.nls.oskari.control.statistics.data;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import fi.nls.oskari.control.statistics.plugins.APIException;
 

service-statistics-common/src/main/java/fi/nls/oskari/control/statistics/plugins/DataSourceCacheUpdater.java

@@ -70,7 +70,7 @@ protected List<StatisticalIndicator> getIndicators() {
      * Returns a Redis key that should hold currently processed indicators of this datasource as list.
      */
     private String getIndicatorListWorkKey() {
-        return StatisticalDatasourcePlugin.CACHE_PREFIX + "worklist:" + plugin.getSource().getId();
+        return StatisticalDatasourcePlugin.CACHE_PREFIX + plugin.getSource().getId() +  ":worklist";
     }
 
     @Override

service-statistics-common/src/main/java/fi/nls/oskari/control/statistics/plugins/StatisticalDatasourcePlugin.java

@@ -54,7 +54,7 @@
  * You should also consider overriding hasPermission() as the default implementation always returns true.
  */
 public abstract class StatisticalDatasourcePlugin {
-    static final String CACHE_PREFIX = "oskari:stats:";
+    public static final String CACHE_PREFIX = "oskari:stats:";
     private static final String CACHE_POSTFIX_LIST = ":indicators";
     private static final String CACHE_POSTFIX_METADATA = ":metadata:";