[SYNCOPE-1804] Introducing syncope-core-persistence-neo4j

.github/workflows/neo4j.yml

@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+name: "Neo4j"
+
+on:
+  push:
+    branches: ['master', 'pr-*']
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 13 * * 4'
+
+jobs:
+  neo4j:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Setup Java JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 21
+    - name: Setup Maven
+      uses: stCarolas/setup-maven@v4.5
+      with:
+        maven-version: 3.9.4
+    - uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build
+      run: mvn -U -T 1C -P 'skipTests,all'
+    - name: 'Unit Tests: Neo4j'
+      run: mvn -f core/persistence-neo4j/pom.xml -P neo4j -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
+    #- name: 'Integration Tests: Neo4j'
+    #  run: mvn -f fit/core-reference/pom.xml -P neo4j-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true

client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java

@@ -34,8 +34,8 @@
 import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.common.lib.to.ConnIdBundle;
 import org.apache.syncope.common.lib.to.ConnInstanceTO;
-import org.apache.syncope.common.lib.to.ConnPoolConfTO;
 import org.apache.syncope.common.lib.to.RealmTO;
+import org.apache.syncope.common.lib.types.ConnPoolConf;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteSettings;
 import org.apache.wicket.extensions.wizard.WizardStep;
@@ -177,7 +177,7 @@ protected void onUpdate(final AjaxRequestTarget target) {
         });
 
         if (connInstanceTO.getPoolConf() == null) {
-            connInstanceTO.setPoolConf(new ConnPoolConfTO());
+            connInstanceTO.setPoolConf(new ConnPoolConf());
         }
 
         add(new AjaxSpinnerFieldPanel.Builder<Integer>().min(0).max(Integer.MAX_VALUE).build(

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DomainDirectoryPanel.java

@@ -37,6 +37,7 @@
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.KeymasterException;
 import org.apache.syncope.common.keymaster.client.api.model.Domain;
+import org.apache.syncope.common.keymaster.client.api.model.JPADomain;
 import org.apache.syncope.common.lib.types.IdRepoEntitlement;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -77,7 +78,7 @@ public DomainDirectoryPanel(final String id, final PageReference pageRef) {
         utilityModal.size(Modal.Size.Small);
         utilityModal.addSubmitButton();
 
-        addNewItemPanelBuilder(new DomainWizardBuilder(domainOps, new Domain(), pageRef), true);
+        addNewItemPanelBuilder(new DomainWizardBuilder(domainOps, new JPADomain(), pageRef), true);
 
         initResultTable();
 

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DomainPoolModalPanel.java

@@ -25,6 +25,8 @@
 import org.apache.syncope.client.ui.commons.markup.html.form.AjaxSpinnerFieldPanel;
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.model.Domain;
+import org.apache.syncope.common.keymaster.client.api.model.JPADomain;
+import org.apache.syncope.common.keymaster.client.api.model.Neo4jDomain;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.PropertyModel;
@@ -62,8 +64,17 @@ public Domain getItem() {
 
     @Override
     public void onSubmit(final AjaxRequestTarget target) {
+        int max = 10;
+        int min = 0;
+        if (domain instanceof JPADomain jpaDomain) {
+            max = jpaDomain.getPoolMaxActive();
+            min = jpaDomain.getPoolMinIdle();
+        } else if (domain instanceof Neo4jDomain neo4jDomain) {
+            max = neo4jDomain.getMaxConnectionPoolSize();
+        }
+
         try {
-            domainOps.adjustPoolSize(domain.getKey(), domain.getPoolMaxActive(), domain.getPoolMinIdle());
+            domainOps.adjustPoolSize(domain.getKey(), max, min);
 
             SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
             this.modal.close(target);

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DomainWizardBuilder.java

@@ -32,6 +32,7 @@
 import org.apache.syncope.client.ui.commons.markup.html.form.EncryptedFieldPanel;
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.model.Domain;
+import org.apache.syncope.common.keymaster.client.api.model.JPADomain;
 import org.apache.syncope.common.lib.types.CipherAlgorithm;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -119,10 +120,11 @@ public Storage(final Domain domain) {
             add(new EncryptedFieldPanel(
                     "dbPassword", "dbPassword", new PropertyModel<>(domain, "dbPassword"), false));
 
-            AjaxDropDownChoicePanel<Domain.TransactionIsolation> transactionIsolation = new AjaxDropDownChoicePanel<>(
-                    "transactionIsolation", "transactionIsolation",
-                    new PropertyModel<>(domain, "transactionIsolation"), false);
-            transactionIsolation.setChoices(List.of(Domain.TransactionIsolation.values()));
+            AjaxDropDownChoicePanel<JPADomain.TransactionIsolation> transactionIsolation =
+                    new AjaxDropDownChoicePanel<>(
+                            "transactionIsolation", "transactionIsolation",
+                            new PropertyModel<>(domain, "transactionIsolation"), false);
+            transactionIsolation.setChoices(List.of(JPADomain.TransactionIsolation.values()));
             transactionIsolation.addRequiredLabel();
             transactionIsolation.setNullValid(false);
             add(transactionIsolation);

client/idrepo/console/src/test/java/org/apache/syncope/client/console/AbstractTest.java

@@ -53,7 +53,7 @@
 import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.ServiceOps;
-import org.apache.syncope.common.keymaster.client.api.model.Domain;
+import org.apache.syncope.common.keymaster.client.api.model.JPADomain;
 import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.syncope.common.lib.info.NumbersInfo;
 import org.apache.syncope.common.lib.info.PlatformInfo;
@@ -105,7 +105,8 @@ public ServiceOps selfServiceOps() {
         @Bean
         public DomainOps domainOps() {
             DomainOps domainOps = mock(DomainOps.class);
-            when(domainOps.list()).thenReturn(List.of(new Domain.Builder(SyncopeConstants.MASTER_DOMAIN).build()));
+            when(domainOps.list()).thenReturn(
+                    List.of(new JPADomain.Builder(SyncopeConstants.MASTER_DOMAIN).build()));
             return domainOps;
         }
 

client/idrepo/enduser/src/test/java/org/apache/syncope/client/enduser/AbstractTest.java

@@ -41,7 +41,7 @@
 import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
 import org.apache.syncope.common.keymaster.client.api.DomainOps;
 import org.apache.syncope.common.keymaster.client.api.ServiceOps;
-import org.apache.syncope.common.keymaster.client.api.model.Domain;
+import org.apache.syncope.common.keymaster.client.api.model.JPADomain;
 import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.syncope.common.lib.info.NumbersInfo;
 import org.apache.syncope.common.lib.info.PlatformInfo;
@@ -95,7 +95,7 @@ public ServiceOps selfServiceOps() {
         @Bean
         public DomainOps domainOps() {
             DomainOps domainOps = mock(DomainOps.class);
-            when(domainOps.list()).thenReturn(List.of(new Domain.Builder(SyncopeConstants.MASTER_DOMAIN).build()));
+            when(domainOps.list()).thenReturn(List.of(new JPADomain.Builder(SyncopeConstants.MASTER_DOMAIN).build()));
             return domainOps;
         }
 

common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnInstanceTO.java

@@ -31,6 +31,7 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.syncope.common.lib.types.ConnConfProperty;
+import org.apache.syncope.common.lib.types.ConnPoolConf;
 import org.apache.syncope.common.lib.types.ConnectorCapability;
 
 public class ConnInstanceTO implements EntityTO {
@@ -59,7 +60,7 @@ public class ConnInstanceTO implements EntityTO {
 
     private Integer connRequestTimeout;
 
-    private ConnPoolConfTO poolConf;
+    private ConnPoolConf poolConf;
 
     @Override
     public String getKey() {
@@ -166,11 +167,11 @@ public void setConnRequestTimeout(final Integer connRequestTimeout) {
         this.connRequestTimeout = connRequestTimeout;
     }
 
-    public ConnPoolConfTO getPoolConf() {
+    public ConnPoolConf getPoolConf() {
         return poolConf;
     }
 
-    public void setPoolConf(final ConnPoolConfTO poolConf) {
+    public void setPoolConf(final ConnPoolConf poolConf) {
         this.poolConf = poolConf;
     }
 

common/idm/lib/src/main/java/org/apache/syncope/common/lib/to/ConnPoolConfTO.java → common/idm/lib/src/main/java/org/apache/syncope/common/lib/types/ConnPoolConf.java

@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.common.lib.to;
+package org.apache.syncope.common.lib.types;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.syncope.common.lib.BaseBean;
 
-public class ConnPoolConfTO implements BaseBean {
+public class ConnPoolConf implements BaseBean {
 
     private static final long serialVersionUID = -214360178113476623L;
 
@@ -87,7 +87,7 @@ public boolean equals(final Object obj) {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        ConnPoolConfTO other = (ConnPoolConfTO) obj;
+        ConnPoolConf other = (ConnPoolConf) obj;
         return new EqualsBuilder().
                 append(maxObjects, other.maxObjects).
                 append(minIdle, other.minIdle).

common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/types/IdRepoImplementationType.java

@@ -47,7 +47,7 @@ public final class IdRepoImplementationType {
             Pair.of(TASKJOB_DELEGATE, "org.apache.syncope.core.provisioning.api.job.SchedTaskJobDelegate"),
             Pair.of(REPORT_DELEGATE, "org.apache.syncope.core.provisioning.api.job.report.ReportJobDelegate"),
             Pair.of(LOGIC_ACTIONS, "org.apache.syncope.core.logic.api.LogicActions"),
-            Pair.of(VALIDATOR, "org.apache.syncope.core.persistence.api.attrvalue.validation.PlainAttrValueValidator"),
+            Pair.of(VALIDATOR, "org.apache.syncope.core.persistence.api.attrvalue.PlainAttrValueValidator"),
             Pair.of(COMMAND, "org.apache.syncope.core.logic.api.Command"),
             Pair.of(RECIPIENTS_PROVIDER, "org.apache.syncope.core.provisioning.api.notification.RecipientsProvider"),
             Pair.of(ITEM_TRANSFORMER, "org.apache.syncope.core.provisioning.api.data.ItemTransformer"));