Olisys 4068 | Integrate the extended registry functionality into OCN

.gitignore

@@ -1,11 +1,10 @@
+EXP1
+
 .idea/
 .gradle/
 build/
 out/
 
 *.hprof
 
-src/main/resources/application.*.properties
-!src/main/resources/application.dev.properties
-!src/main/resources/application.prod.properties
-!src/main/resources/application.docker.properties
+gradle.properties

Dockerfile

@@ -4,4 +4,5 @@ COPY build /ocn-node
 COPY src/main/resources/* /ocn-node/
 WORKDIR /ocn-node
 
+
 CMD ["java", "-jar", "./libs/ocn-node-1.2.0-rc2.jar"]

build.gradle.kts

@@ -1,4 +1,3 @@
-import org.asciidoctor.gradle.AsciidoctorTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootJar
 
@@ -8,17 +7,14 @@ plugins {
     kotlin("plugin.spring") version "1.3.72"
     kotlin("plugin.allopen") version "1.3.72"
     kotlin("kapt") version "1.3.72"
-
     id("org.springframework.boot") version "2.2.6.RELEASE"
     id("io.spring.dependency-management") version "1.0.9.RELEASE"
-    id("org.asciidoctor.convert") version "1.6.1"
 }
 
 group = "snc.openchargingnetwork.node"
 version = "1.2.0-rc2"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
-
 val snippetsDir = "build/generated-snippets"
 
 val developmentOnly: Configuration by configurations.creating
@@ -30,22 +26,25 @@ configurations {
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
+    jcenter() // Use cautiously as it's deprecated
+    gradlePluginPortal() // Added for plugin dependencies
+    maven("https://jitpack.io") // Add this line
 }
 
 dependencies {
-    implementation("com.my-oli:ocn-notary:1.0.2-1")
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("khttp:khttp:1.0.0")
+    implementation("org.danilopianini:khttp:1.2.2")
     implementation("org.web3j:core:4.5.5")
     implementation("org.postgresql:postgresql:42.2.12")
+    implementation("com.jayway.jsonpath:json-path:2.9.0")
+    implementation("com.aayushatharva.brotli4j:brotli4j:1.7.0")
     runtimeOnly("com.h2database:h2")
     kapt("org.springframework.boot:spring-boot-configuration-processor")
-    asciidoctor("org.springframework.restdocs:spring-restdocs-asciidoctor:2.0.4.RELEASE")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
@@ -64,7 +63,7 @@ dependencies {
 allOpen {
     annotation("javax.persistence.Entity")
     annotation("javax.persistence.Embeddable")
-    annotation("javax.persistence.MappedSuperClass")
+    annotation("javax.persistence.MappedSuperclass")
 }
 
 tasks.withType<KotlinCompile> {
@@ -99,35 +98,21 @@ tasks.register<Exec>("ganache") {
     group = "help"
     description = "Runs a ganache-cli instance for integration testing."
     commandLine(listOf(
-            "/usr/bin/env",
-            "ganache-cli",
-            "-m=candy maple cake sugar pudding cream honey rich smooth crumble sweet treat",
-            "--port=8544",
-            "--accounts=20",
-            "--networkId=9",
-            "--gasLimit=10000000"))
-}
-
-val asciidoctor by tasks.getting(AsciidoctorTask::class) {
-    inputs.dir(snippetsDir)
-    dependsOn(test)
-}
-
-tasks {
-    "bootJar"(BootJar::class) {
-        dependsOn(asciidoctor)
-        from("${asciidoctor.get().outputDir}/html5") {
-            into("static/docs")
-        }
-    }
+        "/usr/bin/env",
+        "ganache-cli",
+        "-m=candy maple cake sugar pudding cream honey rich smooth crumble sweet treat",
+        "--port=8544",
+        "--accounts=20",
+        "--networkId=9",
+        "--gasLimit=10000000"
+    ))
 }
 
 (tasks.getByName("processResources") as ProcessResources).apply {
     val profile: String by project
+    println("Building using **/application.$profile.properties")
     include("**/application.$profile.properties")
-    rename {
-        "application.properties"
-    }
+    rename { "application.properties" }
 }
 
 tasks.register<Tar>("archive") {
@@ -139,12 +124,13 @@ tasks.register<Tar>("archive") {
 
     into ("/ocn-node-${project.version}") {
         from(
-                "$buildDir/libs/ocn-node-${project.version}.jar",
-                "src/main/resources/application.dev.properties",
-                "src/main/resources/application.prod.properties",
-                "infra/ocn-node.service",
-                "README.md",
-                "CONFIGURATION.md",
-                "CHANGELOG.md")
+            "$buildDir/libs/ocn-node-${project.version}.jar",
+            "src/main/resources/application.dev.properties",
+            "src/main/resources/application.prod.properties",
+            "infra/ocn-node.service",
+            "README.md",
+            "CONFIGURATION.md",
+            "CHANGELOG.md"
+        )
     }
 }

docker/.dockerignore

@@ -0,0 +1,27 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+**/.idea
+**/docker
+**/kubernetes
+README.md

docker/Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:8-jdk-slim
+
+RUN apt-get update && apt-get install -y brotli
+COPY build /ocn-node
+COPY src/main/resources/* /ocn-node/
+WORKDIR /ocn-node
+
+
+CMD ["java", "-jar", "./libs/ocn-node-1.2.0-rc2.jar"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

jenkins_values.yml

@@ -0,0 +1,7 @@
+chartName: "banula"
+projectName: "ocn-node-v2"
+helm_chart_repo: "github.com/olisystems/oli_banula_helm_charts"
+helm_chart_dir: "oli_banula_helm_charts"
+helm_release_name: "oli-banula"
+deploy_image_key: "ocnnodev2"
+job_namespace: "oli-banula, banula-int"

src/main/kotlin/snc/openchargingnetwork/node/Application.kt

@@ -21,10 +21,11 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
+import snc.openchargingnetwork.node.config.DataSourceProperties
 import snc.openchargingnetwork.node.config.NodeProperties
 
 @SpringBootApplication
-@EnableConfigurationProperties(NodeProperties::class)
+@EnableConfigurationProperties(NodeProperties::class, DataSourceProperties::class)
 @EnableScheduling
 @EnableAsync
 class Application

src/main/kotlin/snc/openchargingnetwork/node/config/DataSourceProperties.kt

@@ -0,0 +1,12 @@
+package snc.openchargingnetwork.node.config
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.stereotype.Component
+
+@Component
+@ConfigurationProperties(prefix = "spring.datasource")
+class DataSourceProperties {
+    lateinit var url: String
+    lateinit var username: String
+    lateinit var password: String
+}

src/main/kotlin/snc/openchargingnetwork/node/config/NodeConfig.kt

@@ -16,6 +16,7 @@
 
 package snc.openchargingnetwork.node.config
 
+import com.olisystems.ocnregistryv2_0.OcnRegistry
 import org.springframework.boot.ApplicationRunner
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -24,8 +25,6 @@ import org.web3j.protocol.Web3j
 import org.web3j.tx.ClientTransactionManager
 import org.web3j.tx.TransactionManager
 import org.web3j.tx.gas.StaticGasProvider
-import snc.openchargingnetwork.contracts.Permissions
-import snc.openchargingnetwork.contracts.Registry
 import snc.openchargingnetwork.node.repositories.*
 import snc.openchargingnetwork.node.scheduledTasks.HubClientInfoStillAliveCheck
 import snc.openchargingnetwork.node.scheduledTasks.PlannedPartySearch
@@ -46,30 +45,23 @@ class NodeConfig(private val properties: NodeProperties) {
                             endpointRepo: EndpointRepository,
                             proxyResourceRepository: ProxyResourceRepository) = ApplicationRunner {}
 
-    @Bean
-    fun registry(): Registry {
-        return Registry.load(
-                properties.web3.contracts.registry,
-                web3,
-                txManager,
-                gasProvider)
-    }
+
 
     @Bean
-    fun permissions(): Permissions {
-        return Permissions.load(
-                properties.web3.contracts.permissions,
-                web3,
-                txManager,
-                gasProvider)
+    fun ocnRegistry(): OcnRegistry {
+        return OcnRegistry.load(
+            properties.web3.contracts.ocnRegistry,
+            web3,
+            txManager,
+            gasProvider)
     }
 
     @Bean
-    fun scheduledTasks(registry: Registry,
-                       httpService: OcnHttpService,
-                       platformRepo: PlatformRepository,
-                       roleRepo: RoleRepository,
-                       networkClientInfoRepo: NetworkClientInfoRepository): List<IntervalTask> {
+    fun newScheduledTasks(registry: OcnRegistry,
+                          httpService: OcnHttpService,
+                          platformRepo: PlatformRepository,
+                          roleRepo: RoleRepository,
+                          networkClientInfoRepo: NetworkClientInfoRepository): List<IntervalTask> {
 
         val taskList = mutableListOf<IntervalTask>()
         val hasPrivateKey = properties.privateKey !== null
@@ -84,10 +76,8 @@ class NodeConfig(private val properties: NodeProperties) {
             val plannedPartyTask = PlannedPartySearch(registry, roleRepo, networkClientInfoRepo, properties)
             taskList.add(IntervalTask(plannedPartyTask, properties.plannedPartySearchRate.toLong()))
         }
-
         return taskList.toList()
     }
-
 //    // modify the default task executor (runs async tasks, not to be confused with scheduled tasks)
 //    @Bean
 //    fun taskExecutor(): TaskExecutor {
@@ -97,4 +87,5 @@ class NodeConfig(private val properties: NodeProperties) {
 //        return taskExecutor
 //    }
 
-}
+}
+