Refactorings/repository pattern

.github/actions/runTestsTaggedAs/action.yaml

@@ -35,7 +35,7 @@ runs:
       run: echo "127.0.0.1       job-engine" | sudo tee -a /etc/hosts
       shell: bash
     - name: Test execution step
-      run: ./ci-output.sh mvn -B ${BUILD_OPTS} ${CONFIG_OVERRIDES} -Dgroups='!org.eclipse.kapua.qa.markers.junit.JUnitTests' -Dcucumber.filter.tags="${{ inputs.tag }}" -pl ${TEST_PROJECTS} verify
+      run: mvn -B ${BUILD_OPTS} ${CONFIG_OVERRIDES} -Dgroups='!org.eclipse.kapua.qa.markers.junit.JUnitTests' -Dcucumber.filter.tags="${{ inputs.tag }}" -pl ${TEST_PROJECTS} verify
       shell: bash
     - name: Code-coverage results
       run: bash <(curl -s https://codecov.io/bash)

README.md

@@ -55,6 +55,8 @@ scenarios.
 **Note:** the Docker Hub repository mentioned above is not the official project repository from Eclipse Foundation.
 ***
 
+Suppose the target is the current snapshot 2.0.0-SNAPSHOT.
+
 * Clone Eclipse Kapua™ into a local directory
 * Open an OS shell and move to Kapua project root directory
 * Start Docker runtime
@@ -109,12 +111,12 @@ On Windows (PowerShell):
 ### Access
 
 Once the containers are running, the Kapua services can be accessed. Eclipse Kapua™ is a multi tenant
-system. The demo installation comes with one default tenant, called _kapua-sys_, which is also the root tenant. 
+system. The demo installation comes with one default tenant, called _kapua-sys_, which is also the root tenant.
 In Eclipse Kapua™ a _tenant_ is commonly referred to as an _account_.
 
 #### The console
 
-The administration console is available at [http://localhost:8080/](http://localhost:8080/). 
+The administration console is available at [http://localhost:8080/](http://localhost:8080/).
 Copy paste the URL above to a Web browser, as the login screen appears, type the following credentials:
 
 * Username: `kapua-sys`
@@ -142,7 +144,9 @@ invoke the API, an easy one is by using the Swagger UI:
 
 ```json
 {
-  "password" : [ "kapua-password" ],
+  "password": [
+    "kapua-password"
+  ],
   "username": "kapua-sys"
 }
 ```

assembly/service/authentication/entrypoint/run-service-authentication

@@ -11,4 +11,4 @@
 #        Eurotech
 ################################################################################
 
-java ${JAVA_OPTS} ${DEBUG_OPTS} ${JMX_OPTS} -jar kapua-service-authentication-2.0.0-SNAPSHOT-app.jar
+java ${JAVA_OPTS} ${DEBUG_OPTS} ${JMX_OPTS} -jar kapua-service-authentication-2.0.0-SNAPSHOT-app.jar

broker/artemis/plugin/pom.xml

@@ -62,7 +62,7 @@
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-client-security</artifactId>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.eclipse.kapua</groupId>
             <artifactId>kapua-security-authentication-api</artifactId>
         </dependency>

client/gateway/profile/kura/src/main/protobuf/kurapayload.proto

@@ -1,59 +1,57 @@
 /*
  * This file originates from the Eclipse Kura™ project
  */
-
-//
 // To compile:
 // protoc --proto_path=src/main/protobuf --java_out=src/main/java src/main/protobuf/kurapayload.proto
 //
 syntax = "proto2";
 
 package kuradatatypes;
 
-option java_package         = "org.eclipse.kapua.gateway.client.kura.payload";
+option java_package = "org.eclipse.kapua.gateway.client.kura.payload";
 option java_outer_classname = "KuraPayloadProto";
 
 message KuraPayload {
 
-	message KuraMetric {
-		enum ValueType {  
-			DOUBLE         = 0; 
-			FLOAT          = 1;
-			INT64          = 2;
-			INT32          = 3;
-			BOOL           = 4;
-			STRING         = 5;
-			BYTES          = 6;
-		}
-
-		required string    name            = 1;
-		required ValueType type            = 2;
-
-		optional double double_value       = 3;
-		optional float  float_value        = 4;
-		optional int64  long_value         = 5;
-		optional int32  int_value          = 6;
-		optional bool   bool_value         = 7;
-		optional string string_value       = 8;
-		optional bytes  bytes_value        = 9;
-	}
-
-    message KuraPosition {
-        required double latitude   = 1;
-        required double longitude  = 2;
-        optional double altitude   = 3;
-        optional double precision  = 4;  // dilution of precision of the current satellite fix. 
-        optional double heading    = 5;  // heading in degrees
-        optional double speed      = 6;  // meters per second
-        optional int64  timestamp  = 7;
-        optional int32  satellites = 8;  // number satellites locked by the GPS device
-        optional int32  status     = 9;  // status indicator for the GPS data: 1 = no GPS response; 2 = error in response; 4 = valid.
+  message KuraMetric {
+    enum ValueType {
+      DOUBLE = 0;
+      FLOAT = 1;
+      INT64 = 2;
+      INT32 = 3;
+      BOOL = 4;
+      STRING = 5;
+      BYTES = 6;
     }
 
-    optional int64       timestamp = 1;
-    optional KuraPosition position  = 2;
-
-	extensions 3 to 4999;
-    repeated KuraMetric   metric    = 5000;  // can be zero, so optional
- 	optional bytes       body      = 5001;
+    required string    name = 1;
+    required ValueType type = 2;
+
+    optional double double_value = 3;
+    optional float  float_value = 4;
+    optional int64  long_value = 5;
+    optional int32  int_value = 6;
+    optional bool   bool_value = 7;
+    optional string string_value = 8;
+    optional bytes  bytes_value = 9;
+  }
+
+  message KuraPosition {
+    required double latitude = 1;
+    required double longitude = 2;
+    optional double altitude = 3;
+    optional double precision = 4;  // dilution of precision of the current satellite fix.
+    optional double heading = 5;  // heading in degrees
+    optional double speed = 6;  // meters per second
+    optional int64  timestamp = 7;
+    optional int32  satellites = 8;  // number satellites locked by the GPS device
+    optional int32  status = 9;  // status indicator for the GPS data: 1 = no GPS response; 2 = error in response; 4 = valid.
+  }
+
+  optional int64       timestamp = 1;
+  optional KuraPosition position = 2;
+
+  extensions 3 to 4999;
+  repeated KuraMetric   metric = 5000;  // can be zero, so optional
+  optional bytes       body = 5001;
 }

commons/pom.xml

@@ -23,7 +23,6 @@
     </parent>
 
     <artifactId>kapua-commons</artifactId>
-
     <build>
         <resources>
             <resource>
@@ -116,6 +115,10 @@
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
 
         <!-- Caching dependencies -->
         <dependency>

commons/src/main/java/org/eclipse/kapua/commons/CommonsModule.java

@@ -12,10 +12,18 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons;
 
+import com.google.inject.Provides;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EventStorer;
+import org.eclipse.kapua.commons.jpa.EventStorerImpl;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.model.query.QueryFactoryImpl;
+import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
+import org.eclipse.kapua.commons.service.event.store.internal.EventStoreRecordImplJpaRepository;
 import org.eclipse.kapua.model.query.QueryFactory;
 
+import javax.inject.Singleton;
+
 /**
  * {@code kapua-commons} {@link AbstractKapuaModule}.
  *
@@ -27,4 +35,17 @@ public class CommonsModule extends AbstractKapuaModule {
     protected void configureModule() {
         bind(QueryFactory.class).to(QueryFactoryImpl.class);
     }
+
+    @Provides
+    @Singleton
+    EventStoreRecordRepository eventStoreRecordRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) {
+        return new EventStoreRecordImplJpaRepository(jpaRepoConfig);
+    }
+
+    @Provides
+    @Singleton
+    EventStorer eventPersister(EventStoreRecordRepository repository) {
+        return new EventStorerImpl(repository);
+    }
+
 }

commons/src/main/java/org/eclipse/kapua/commons/configuration/AbstractKapuaConfigurableResourceLimitedService.java

@@ -32,16 +32,13 @@
 import org.eclipse.kapua.service.KapuaEntityService;
 import org.eclipse.kapua.service.KapuaService;
 import org.eclipse.kapua.service.account.Account;
-import org.eclipse.kapua.service.account.AccountListResult;
 import org.eclipse.kapua.service.authorization.AuthorizationService;
 import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
 import org.eclipse.kapua.service.config.KapuaConfigurableService;
 
 import java.util.Map;
 import java.util.Optional;
 
-//TODO: this should be a collaborator, not a base class
-
 /**
  * Base {@code abstract} {@link KapuaConfigurableService} implementation for services that have a max number of entities allowed.
  * <p>
@@ -72,13 +69,13 @@ public abstract class AbstractKapuaConfigurableResourceLimitedService<
         extends AbstractKapuaConfigurableService
         implements KapuaEntityService<E, C> {
 
+
     //TODO: make final as soon as deprecated constructors are removed
     private AccountChildrenFinder accountChildrenFinder;
     private F factory;
     //TODO: remove as soon as deprecated constructors are removed
     private final Class<F> factoryClass;
 
-
     /**
      * Constructor.
      *
@@ -100,7 +97,7 @@ protected AbstractKapuaConfigurableResourceLimitedService(
                 domain,
                 entityManagerFactory,
                 null,
-                serviceClass,
+                null,
                 factoryClass);
     }
 
@@ -111,8 +108,6 @@ protected AbstractKapuaConfigurableResourceLimitedService(
      * @param domain               The {@link Domain} on which check access.
      * @param entityManagerFactory The {@link EntityManagerFactory} that handles persistence unit
      * @param abstractCacheFactory The {@link CacheFactory} that handles caching of the entities
-     * @param serviceClass         The {@link KapuaService} type.
-     * @param factoryClass         The {@link KapuaEntityFactory} type.
      * @since 1.2.0
      * @deprecated Since 2.0.0. Please use {@link #AbstractKapuaConfigurableResourceLimitedService(String, Domain, EntityManagerFactory, AbstractEntityCacheFactory, KapuaEntityFactory, PermissionFactory, AuthorizationService, AccountChildrenFinder, RootUserTester)} This constructor may be removed in a next release
      */
@@ -146,7 +141,6 @@ protected AbstractKapuaConfigurableResourceLimitedService(
      * @param permissionFactory    The {@link PermissionFactory} instance.
      * @param authorizationService The {@link AuthorizationService} instance.
      * @param rootUserTester       The {@link RootUserTester} instance.
-     * @since 2.0.0
      */
     protected AbstractKapuaConfigurableResourceLimitedService(String pid,
                                                               Domain domain,
@@ -250,7 +244,7 @@ private long allowedChildEntities(KapuaId scopeId, KapuaId targetScopeId, Map<St
             // Current used entities
             long currentUsedEntities = this.count(countQuery);
 
-            AccountListResult childAccounts = getAccountChildrenFinder().findChildren(scopeId, Optional.ofNullable(targetScopeId));
+            final KapuaListResult<Account> childAccounts = txManager.execute(tx -> getAccountChildrenFinder().findChildren(scopeId, Optional.ofNullable(targetScopeId)));
             // Resources assigned to children
             long childCount = 0;
             for (Account childAccount : childAccounts.getItems()) {