stellio-hub · vraybaud · Jun 9, 2020 · Jun 4, 2020
diff --git a/README.md b/README.md
@@ -108,6 +108,14 @@ If you want to build only one of the services, you can launch:
 ./gradlew entity-service:build
 ```
 
+### Formatting the code
+
+To format the code, we use Intellij built-in formatter with settings that can be found in the `config/settings` directory.
+
+Import settings with `File/Manage IDE Settings/Import Settings...`.
+
+You can use plugins like [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) that applies changed code refactoring and optimized imports on a save.
+
 ### Working locally with Docker images
 
 To work locally with a Docker image of a service without publishing it to Docker Hub, you can follow the below instructions:

diff --git a/api-gateway/src/main/kotlin/com/egm/stellio/apigateway/ApiGatewayApplication.kt b/api-gateway/src/main/kotlin/com/egm/stellio/apigateway/ApiGatewayApplication.kt
@@ -2,8 +2,8 @@ package com.egm.stellio.apigateway
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
-import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder
 import org.springframework.cloud.gateway.route.RouteLocator
+import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder
 import org.springframework.cloud.security.oauth2.gateway.TokenRelayGatewayFilterFactory
 import org.springframework.context.annotation.Bean
 

diff --git a/api-gateway/src/main/kotlin/com/egm/stellio/apigateway/config/SecurityConfig.kt b/api-gateway/src/main/kotlin/com/egm/stellio/apigateway/config/SecurityConfig.kt
@@ -14,4 +14,4 @@ class SecurityConfig {
     fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
         return http.csrf().disable().build()
     }
-}
+}
diff --git a/config/settings/stellio_format_settings.zip b/config/settings/stellio_format_settings.zip
diff --git a/docs/cla/cla.json b/docs/cla/cla.json
@@ -1,3 +1,3 @@
 {
   "signedContributors": []
-}
+}
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/config/AsynchronousEventsConfig.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/config/AsynchronousEventsConfig.kt
@@ -2,9 +2,9 @@ package com.egm.stellio.entity.config
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.core.task.SimpleAsyncTaskExecutor
-import org.springframework.context.event.SimpleApplicationEventMulticaster
 import org.springframework.context.event.ApplicationEventMulticaster
+import org.springframework.context.event.SimpleApplicationEventMulticaster
+import org.springframework.core.task.SimpleAsyncTaskExecutor
 
 @Configuration
 class AsynchronousEventsConfig {

diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/config/Neo4jConfiguration.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/config/Neo4jConfiguration.kt
@@ -1,11 +1,11 @@
 package com.egm.stellio.entity.config
 
+import org.neo4j.ogm.session.SessionFactory
+import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories
-import org.springframework.transaction.annotation.EnableTransactionManagement
 import org.springframework.data.neo4j.transaction.Neo4jTransactionManager
-import org.neo4j.ogm.session.SessionFactory
-import org.springframework.context.annotation.Bean
+import org.springframework.transaction.annotation.EnableTransactionManagement
 
 @Configuration
 @EnableNeo4jRepositories(basePackages = ["com.egm.stellio.entity.repository"])

diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/config/WebSecurityConfig.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/config/WebSecurityConfig.kt
@@ -34,4 +34,4 @@ class WebSecurityConfig {
 
         return http.build()
     }
-}
+}
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/model/Attribute.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/model/Attribute.kt
@@ -12,7 +12,7 @@ import org.neo4j.ogm.annotation.Transient
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
-import java.util.*
+import java.util.UUID
 
 @NodeEntity
 open class Attribute(

diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/model/Entity.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/model/Entity.kt
@@ -9,7 +9,9 @@ import com.egm.stellio.shared.util.NgsiLdParsingUtils.NGSILD_ENTITY_TYPE
 import com.egm.stellio.shared.util.NgsiLdParsingUtils.NGSILD_GEOPROPERTY_VALUE
 import com.egm.stellio.shared.util.NgsiLdParsingUtils.NGSILD_LOCATION_PROPERTY
 import com.egm.stellio.shared.util.NgsiLdParsingUtils.NGSILD_MODIFIED_AT_PROPERTY
-import com.fasterxml.jackson.annotation.*
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
 import org.neo4j.ogm.annotation.Id
 import org.neo4j.ogm.annotation.Labels
 import org.neo4j.ogm.annotation.NodeEntity

diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/model/Relationship.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/model/Relationship.kt
@@ -13,4 +13,4 @@ class Relationship(
     val type: List<String>,
 
     observedAt: ZonedDateTime? = null
-) : Attribute(attributeType = "Relationship", observedAt = observedAt)
+) : Attribute(attributeType = "Relationship", observedAt = observedAt)
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/AttributeRepository.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/AttributeRepository.kt
@@ -5,4 +5,4 @@ import org.springframework.data.neo4j.repository.Neo4jRepository
 import org.springframework.stereotype.Repository
 
 @Repository
-interface AttributeRepository : Neo4jRepository<Attribute, String>
+interface AttributeRepository : Neo4jRepository<Attribute, String>
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/EntityRepository.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/EntityRepository.kt
@@ -8,36 +8,44 @@ import org.springframework.stereotype.Repository
 @Repository
 interface EntityRepository : Neo4jRepository<Entity, String> {
 
-    @Query("""
+    @Query(
+        """
         MATCH (entity:Entity { id: {id} })
         RETURN entity
-    """)
+        """
+    )
     fun getEntityCoreById(id: String): List<Map<String, Any>>
 
-    @Query("""
+    @Query(
+        """
         MATCH (entity:Entity { id: {id} })-[:HAS_VALUE]->(property:Property)
         OPTIONAL MATCH (property)-[:HAS_VALUE]->(propValue:Property)
         OPTIONAL MATCH (property)-[:HAS_OBJECT]->(relOfProp:Relationship)-[rel]->(relOfPropObject:Entity)
         WHERE type(rel) <> 'HAS_OBJECT'
         RETURN property, propValue, type(rel) as relType, relOfProp, relOfPropObject
-    """)
+        """
+    )
     fun getEntitySpecificProperties(id: String): List<Map<String, Any>>
 
-    @Query("""
+    @Query(
+        """
         MATCH (entity:Entity { id: {id} })-[:HAS_VALUE]->(property:Property {id: {propertyId} })
         OPTIONAL MATCH (property)-[:HAS_VALUE]->(propValue:Property)
         OPTIONAL MATCH (property)-[:HAS_OBJECT]->(relOfProp:Relationship)-[rel]->(relOfPropObject:Entity)
         WHERE type(rel) <> 'HAS_OBJECT'
         RETURN property, propValue, type(rel) as relType, relOfProp, relOfPropObject
-    """)
+        """
+    )
     fun getEntitySpecificProperty(id: String, propertyId: String): List<Map<String, Any>>
 
-    @Query("""
+    @Query(
+        """
         MATCH (entity:Entity { id: {id} })-[:HAS_OBJECT]->(rel:Relationship)-[r]->(relObject:Entity)
         WHERE type(r) <> 'HAS_OBJECT'
         OPTIONAL MATCH (rel)-[:HAS_OBJECT]->(relOfRel:Relationship)-[or]->(relOfRelObject:Entity)
         WHERE type(or) <> 'HAS_OBJECT'
         RETURN rel, type(r) as relType, relObject, relOfRel, type(or) as relOfRelType, relOfRelObject
-    """)
+        """
+    )
     fun getEntityRelationships(id: String): List<Map<String, Any>>
 }
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/Neo4jRepository.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/Neo4jRepository.kt
@@ -39,7 +39,7 @@ class Neo4jRepository(
             MATCH (subject:Attribute { id: "$relationshipId" }), (target:Entity { id: "$entityId" })
             MERGE (subject)-[:$relationshipType]->(target)
             MERGE (subject)-[:HAS_OBJECT]->(target)
-        """
+            """
 
         return session.query(query, emptyMap<String, String>()).queryStatistics().relationshipsCreated
     }
@@ -52,7 +52,7 @@ class Neo4jRepository(
         val query = """
             MERGE (subject:Entity { id: "$subjectId" })
             ON MATCH SET subject.location = point({x: ${coordinates.first}, y: ${coordinates.second}, crs: 'wgs-84'})
-        """
+            """
         return session.query(query, emptyMap<String, String>()).queryStatistics().propertiesSet
     }
 
@@ -71,7 +71,7 @@ class Neo4jRepository(
         val query = """
             MATCH (a { id: '$attributeId' })-[:HAS_OBJECT]->(rel)-[:$relationshipType]->()
             RETURN a.id
-        """.trimIndent()
+            """.trimIndent()
 
         return session.query(query, emptyMap<String, String>(), true).toList().isNotEmpty()
     }
@@ -80,7 +80,7 @@ class Neo4jRepository(
         val query = """
             MATCH (a { id: '$attributeId' })-[:HAS_VALUE]->(property:Property { name: "$propertyName" })
             RETURN a.id
-        """.trimIndent()
+            """.trimIndent()
 
         return session.query(query, emptyMap<String, String>(), true).toList().isNotEmpty()
     }
@@ -89,7 +89,7 @@ class Neo4jRepository(
         val query = """
             MATCH (a { id: '$attributeId' }) WHERE a.$geoPropertyName IS NOT NULL
             RETURN a.id
-        """.trimIndent()
+            """.trimIndent()
 
         return session.query(query, emptyMap<String, String>(), true).toList().isNotEmpty()
     }
@@ -106,17 +106,19 @@ class Neo4jRepository(
                   (target:Entity { id: "$newRelationshipObjectId" })
             DETACH DELETE v
             MERGE (a)-[:HAS_OBJECT]->(target)
-        """.trimIndent()
+            """.trimIndent()
 
         val relationshipTypeQuery = """
             MATCH (a:Attribute { id: "$attributeId" })-[v:$relationshipType]->(e:Entity { id: '$oldRelationshipObjectId' }),
                   (target:Entity { id: "$newRelationshipObjectId" })
             DETACH DELETE v
             MERGE (a)-[:$relationshipType]->(target)
-        """.trimIndent()
+            """.trimIndent()
 
-        val objectQueryStatistics = session.query(hasObjectQuery, emptyMap<String, String>()).queryStatistics().nodesDeleted
-        val relationshipTypeQueryStatistics = session.query(relationshipTypeQuery, emptyMap<String, String>()).queryStatistics().nodesDeleted
+        val objectQueryStatistics =
+            session.query(hasObjectQuery, emptyMap<String, String>()).queryStatistics().nodesDeleted
+        val relationshipTypeQueryStatistics =
+            session.query(relationshipTypeQuery, emptyMap<String, String>()).queryStatistics().nodesDeleted
 
         return Pair(objectQueryStatistics, relationshipTypeQueryStatistics)
     }
@@ -126,7 +128,7 @@ class Neo4jRepository(
         val query = """
             MERGE (entity:Entity { id: "$entityId" })
             ON MATCH SET entity.location = point({x: ${coordinates.first}, y: ${coordinates.second}, crs: 'wgs-84'})
-        """
+            """
         return session.query(query, emptyMap<String, String>()).queryStatistics().propertiesSet
     }
 
@@ -152,7 +154,7 @@ class Neo4jRepository(
             OPTIONAL MATCH (rel)-[:HAS_VALUE]->(propOfRel)
             OPTIONAL MATCH (rel)-[:HAS_OBJECT]->(relOfRel:Relationship)
             DETACH DELETE n,prop,relOfProp,propOfProp,rel,propOfRel,relOfRel
-        """.trimIndent()
+            """.trimIndent()
 
         val queryStatistics = session.query(query, emptyMap<String, Any>()).queryStatistics()
         logger.debug("Deleted entity $entityId : deleted ${queryStatistics.nodesDeleted} nodes, ${queryStatistics.relationshipsDeleted} relations")
@@ -180,7 +182,7 @@ class Neo4jRepository(
             OPTIONAL MATCH (rel)-[:HAS_VALUE]->(propOfRel)
             OPTIONAL MATCH (rel)-[:HAS_OBJECT]->(relOfRel:Relationship)
             DETACH DELETE prop,relOfProp,propOfProp,rel,propOfRel,relOfRel
-        """.trimIndent()
+            """.trimIndent()
 
         val queryStatistics = session.query(query, emptyMap<String, Any>()).queryStatistics()
         logger.debug("Deleted entity $entityId attributes : deleted ${queryStatistics.nodesDeleted} nodes, ${queryStatistics.relationshipsDeleted} relations")
@@ -201,7 +203,7 @@ class Neo4jRepository(
             OPTIONAL MATCH (prop)-[:HAS_VALUE]->(propOfProp)
             OPTIONAL MATCH (prop)-[:HAS_OBJECT]->(relOfProp)
             DETACH DELETE prop,propOfProp,relOfProp
-        """.trimIndent()
+            """.trimIndent()
 
         val queryStatistics = session.query(query, emptyMap<String, Any>()).queryStatistics()
         logger.debug("Deleted property $propertyName : deleted ${queryStatistics.nodesDeleted} nodes, ${queryStatistics.relationshipsDeleted} relations")
@@ -227,7 +229,7 @@ class Neo4jRepository(
             OPTIONAL MATCH (rel)-[:HAS_VALUE]->(propOfRel)
             OPTIONAL MATCH (rel)-[:HAS_OBJECT]->(relOfRel:Relationship)
             DETACH DELETE rel,propOfRel,relOfRel
-        """.trimIndent()
+            """.trimIndent()
 
         val queryStatistics = session.query(query, emptyMap<String, Any>()).queryStatistics()
         logger.debug("Deleted relationship $relationshipType : deleted ${queryStatistics.nodesDeleted} nodes, ${queryStatistics.relationshipsDeleted} relations")
@@ -289,7 +291,7 @@ class Neo4jRepository(
                 ${if (propertiesFilter.isNotEmpty() && relationshipsFilter.isNotEmpty()) " AND " else ""}
                 $relationshipsFilter
             RETURN n.id as id
-        """
+            """
 
         logger.debug("Issuing search query $finalQuery")
         return session.query(finalQuery, emptyMap<String, Any>(), true)
@@ -316,7 +318,7 @@ class Neo4jRepository(
             AND deviceProp.name = '$propertyName' 
             AND toLower(deviceProp.value) = toLower('$observerId') 
             RETURN e
-        """.trimIndent()
+            """.trimIndent()
 
         logger.debug("Issuing query $query")
         return session.query(query, emptyMap<String, Any>(), true).toMutableList()
@@ -328,7 +330,7 @@ class Neo4jRepository(
         val query = """
             MATCH (p:Property)-[:HAS_OBJECT]->(r:Relationship)-[:$relationshipType]->(e:Entity { id: '$observerId' })
             RETURN p
-        """.trimIndent()
+            """.trimIndent()
 
         logger.debug("Issuing query $query")
         return session.query(query, emptyMap<String, Any>(), true).toMutableList()
@@ -340,7 +342,7 @@ class Neo4jRepository(
         val query = """
             MATCH (n:Entity)-[:HAS_VALUE]->(p:Property { id: '${property.id}' })
             RETURN n
-        """.trimIndent()
+            """.trimIndent()
 
         logger.debug("Issuing query $query")
         return session.query(query, emptyMap<String, Any>(), true).toMutableList()
@@ -356,7 +358,7 @@ class Neo4jRepository(
             MATCH (entity:Entity)
             WHERE entity.id IN {entitiesIds}
             RETURN entity.id as id
-        """
+            """
 
         return session.query(query, mapOf("entitiesIds" to entitiesIds), true).map { it["id"] as String }
     }
@@ -365,7 +367,7 @@ class Neo4jRepository(
         val query = """
             MATCH ({ id: '$subjectId' })-[:HAS_VALUE]->(p:Property { name: "$propertyName" })
             RETURN p
-        """.trimIndent()
+            """.trimIndent()
 
         return session.query(query, emptyMap<String, Any>(), true).toMutableList()
             .map { it["p"] as Property }
@@ -376,7 +378,7 @@ class Neo4jRepository(
         val query = """
             MATCH ({ id: '$subjectId' })-[:HAS_OBJECT]->(r:Relationship)-[:$relationshipType]->()
             RETURN r
-        """.trimIndent()
+            """.trimIndent()
 
         return session.query(query, emptyMap<String, Any>(), true).toMutableList()
             .map { it["r"] as Relationship }
@@ -387,7 +389,7 @@ class Neo4jRepository(
         val query = """
             MATCH ({ id: '$subjectId' })-[:HAS_OBJECT]->(r:Relationship)-[:$relationshipType]->(e: Entity)
             RETURN e
-        """.trimIndent()
+            """.trimIndent()
         return session.query(query, emptyMap<String, Any>(), true).toMutableList()
             .map { it["e"] as Entity }
             .firstOrNull()

diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/PropertyRepository.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/PropertyRepository.kt
@@ -5,4 +5,4 @@ import org.springframework.data.neo4j.repository.Neo4jRepository
 import org.springframework.stereotype.Repository
 
 @Repository
-interface PropertyRepository : Neo4jRepository<Property, String>
+interface PropertyRepository : Neo4jRepository<Property, String>
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/RelationshipRepository.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/repository/RelationshipRepository.kt
@@ -5,4 +5,4 @@ import org.springframework.data.neo4j.repository.Neo4jRepository
 import org.springframework.stereotype.Repository
 
 @Repository
-interface RelationshipRepository : Neo4jRepository<Relationship, String>
+interface RelationshipRepository : Neo4jRepository<Relationship, String>
diff --git a/entity-service/src/main/kotlin/com/egm/stellio/entity/service/EntityOperationService.kt b/entity-service/src/main/kotlin/com/egm/stellio/entity/service/EntityOperationService.kt
@@ -92,11 +92,14 @@ class EntityOperationService(
         }.collect(
             { BatchOperationResult() },
             { batchOperationResult, updateResult ->
-                updateResult.fold({
-                    batchOperationResult.errors.add(it)
-                }, {
-                    batchOperationResult.success.add(it)
-                })
+                updateResult.fold(
+                    {
+                        batchOperationResult.errors.add(it)
+                    },
+                    {
+                        batchOperationResult.success.add(it)
+                    }
+                )
             },
             BatchOperationResult::plusAssign
         )