lsc-project#199: JAXB Sources are generated in target folder.

Worteks · Jul 15, 2024 · 8250baf · 8250baf
1 parent d0dd138
commit 8250baf
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 70 deletions.
diff --git a/pom.xml b/pom.xml
@@ -308,11 +308,11 @@
 				</executions>
 				<configuration>
 					<episode>true</episode>
-					<episodeFile>${basedir}/lsc.episode</episodeFile>
-					<generateDirectory>src/main/java</generateDirectory>
 					<generatePackage>org.lsc.configuration</generatePackage>
 					<bindingDirectory>src/main/resources/schemas</bindingDirectory>
-					<bindingIncludes><bindingInclude>lsc-core-2.2.xjc</bindingInclude></bindingIncludes>
+					<bindingIncludes>
+						<bindingInclude>lsc-core-2.2.xjc</bindingInclude>
+					</bindingIncludes>
 					<schemaDirectory>src/main/resources/schemas</schemaDirectory>
 					<schemaIncludes>
 						<schemaInclude>lsc-core-2.2.xsd</schemaInclude>

diff --git a/src/main/java/org/lsc/AbstractSynchronize.java b/src/main/java/org/lsc/AbstractSynchronize.java
@@ -45,32 +45,23 @@
  */
 package org.lsc;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.naming.CommunicationException;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.lsc.LscDatasetModification.LscDatasetModificationType;
-import org.lsc.beans.BeanComparator;
 import org.lsc.beans.IBean;
 import org.lsc.beans.InfoCounter;
-import org.lsc.beans.syncoptions.ISyncOptions;
 import org.lsc.configuration.LscConfiguration;
-import org.lsc.configuration.PivotTransformationType.Transformation;
-import org.lsc.exception.LscServiceCommunicationException;
+import org.lsc.configuration.PivotTransformationType;
 import org.lsc.exception.LscServiceException;
 import org.lsc.runnable.AsynchronousRunner;
 import org.lsc.runnable.CleanEntryRunner;
 import org.lsc.runnable.SynchronizeEntryRunner;
-import org.lsc.service.IAsynchronousService;
 import org.lsc.service.IService;
 import org.lsc.utils.LSCStructuralLogger;
 import org.lsc.utils.ScriptingEvaluator;
@@ -418,11 +409,11 @@ protected String getLogStatus(InfoCounter counter) {
 	}
 
 	public IBean getBean(Task task, IService service, String pivotName, LscDatasets pivotAttributes, boolean fromSameService, boolean fromSource) throws LscServiceException {
-		List<Transformation> transformations = LscConfiguration.getPivotTransformation(task.getTaskType());
+		List<PivotTransformationType.Transformation> transformations = LscConfiguration.getPivotTransformation(task.getTaskType());
 		if (! fromSameService && transformations != null) {
 			LscDatasets newPivots = new LscDatasets(pivotAttributes.getDatasets());
 			for (Entry<String, Object> pivot: pivotAttributes.getDatasets().entrySet()) {
-				for (Transformation transformation: transformations) {
+				for (PivotTransformationType.Transformation transformation: transformations) {
 					if (pivot.getKey().equalsIgnoreCase(transformation.getFromAttribute()) && LscConfiguration.pivotOriginMatchesFromSource(transformation.getPivotOrigin(), fromSource)) {
 						newPivots.put(transformation.getToAttribute(), transform(task, transformation, pivot.getValue()));
 					}
@@ -433,7 +424,7 @@ public IBean getBean(Task task, IService service, String pivotName, LscDatasets
 		return service.getBean(pivotName, pivotAttributes, fromSameService);
 	}
 
-	protected Object transform(Task task, Transformation transformation, Object value) throws LscServiceException{
+	protected Object transform(Task task, PivotTransformationType.Transformation transformation, Object value) throws LscServiceException{
 		Map<String, Object> javaScriptObjects = new HashMap<String, Object>();
 		javaScriptObjects.put("value", value);
 		if (task.getCustomLibraries() != null) {

diff --git a/src/main/java/org/lsc/beans/BeanComparator.java b/src/main/java/org/lsc/beans/BeanComparator.java
@@ -66,7 +66,6 @@
 import org.lsc.LscModificationType;
 import org.lsc.LscModifications;
 import org.lsc.Task;
-import org.lsc.beans.syncoptions.ISyncOptions;
 import org.lsc.configuration.LscConfiguration;
 import org.lsc.configuration.PolicyType;
 import org.lsc.exception.LscServiceException;
@@ -442,9 +441,6 @@ private static LscDatasetModificationType getRequiredOperationForAttribute (
 	 * attributes, and all force valued/default valued/create valued attributes.
 	 * </P>
 	 *
-	 * @param syncOptions
-	 *            Instance of {@link ISyncOptions} to provide transformation
-	 *            configuration
 	 * @param srcBean
 	 *            The original bean read from the source
 	 * @return Set of attribute names to be updated
@@ -592,9 +588,6 @@ private static IBean cloneSrcBean(Task task, IBean srcBean, IBean dstBean) throw
 	 * @param srcAttrValues
 	 *            {@link Set}<Object> All values of the considered attribute
 	 *            read from the source.
-	 * @param syncOptions
-	 *            {@link ISyncOptions} Object to read syncoptions from
-	 *            configuration.
 	 * @param javaScriptObjects
 	 *            {@link Map}<String, Object> Object map to pass objects into
 	 *            JavaScript environment.

diff --git a/src/main/java/org/lsc/beans/syncoptions/PropertiesBasedSyncOptions.java b/src/main/java/org/lsc/beans/syncoptions/PropertiesBasedSyncOptions.java
@@ -52,12 +52,7 @@
 import java.util.Optional;
 
 import org.lsc.LscModificationType;
-import org.lsc.configuration.DatasetType;
-import org.lsc.configuration.LscConfiguration;
-import org.lsc.configuration.PolicyType;
-import org.lsc.configuration.PropertiesBasedSyncOptionsType;
-import org.lsc.configuration.TaskType;
-import org.lsc.configuration.ValuesType;
+import org.lsc.configuration.*;
 
 /**
  * Synchronization options based on a properties file

diff --git a/src/main/java/org/lsc/configuration/.gitignore b/src/main/java/org/lsc/configuration/.gitignore
diff --git a/src/main/java/org/lsc/configuration/LscConfiguration.java b/src/main/java/org/lsc/configuration/LscConfiguration.java
@@ -57,7 +57,6 @@
 
 import org.lsc.beans.syncoptions.ForceSyncOptions;
 import org.lsc.beans.syncoptions.PropertiesBasedSyncOptions;
-import org.lsc.configuration.PivotTransformationType.Transformation;
 import org.lsc.exception.LscConfigurationException;
 import org.lsc.exception.LscException;
 import org.lsc.jndi.PullableJndiSrcService;
@@ -534,7 +533,7 @@ public static boolean isLdapBinaryAttribute(String attributeName) {
     	return false;
     }
 
-    public static List<Transformation> getPivotTransformation(TaskType task) {
+    public static List<PivotTransformationType.Transformation> getPivotTransformation(TaskType task) {
 		SyncOptionsType syncOptions = LscConfiguration.getSyncOptions(task);
 		if (! LscConfiguration.getSyncOptionsImplementation(syncOptions).equals(PropertiesBasedSyncOptions.class)) {
 			return null;

diff --git a/src/main/java/org/lsc/jndi/AbstractSimpleJndiService.java b/src/main/java/org/lsc/jndi/AbstractSimpleJndiService.java
@@ -175,7 +175,7 @@ public AbstractSimpleJndiService(final LdapServiceType ldapService) throws LscSe
 		for (String attr: ldapService.getFetchedAttributes().getString()) {
 			attrs.add(attr);
 		}
-		jndiServices = JndiServices.getInstance((LdapConnectionType)ldapService.getConnection().getReference());
+		jndiServices = JndiServices.getInstance((LdapConnectionType) ldapService.getConnection().getReference());
 		if(!baseDn.endsWith(jndiServices.getContextDn())) {
 			LOGGER.warn("Your baseDn settings (" + baseDn + ") does not end with the LDAP naming context (" + jndiServices.getContextDn() + "). This is probably an error ! For LSC 1.X users, this is part of the changelog to 2.X.");
 		}

diff --git a/src/main/java/org/lsc/jndi/JndiServices.java b/src/main/java/org/lsc/jndi/JndiServices.java
@@ -102,11 +102,7 @@
 import org.apache.directory.api.ldap.model.url.LdapUrl;
 import org.lsc.Configuration;
 import org.lsc.LscDatasets;
-import org.lsc.configuration.LdapAuthenticationType;
-import org.lsc.configuration.LdapConnectionType;
-import org.lsc.configuration.LdapDerefAliasesType;
-import org.lsc.configuration.LdapReferralType;
-import org.lsc.configuration.LdapVersionType;
+import org.lsc.configuration.*;
 import org.lsc.exception.LscConfigurationException;
 import org.lsc.exception.LscServiceException;
 import org.slf4j.Logger;

diff --git a/src/main/java/org/lsc/service/SimpleJdbcSrcService.java b/src/main/java/org/lsc/service/SimpleJdbcSrcService.java
@@ -50,18 +50,13 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Properties;
 
-import org.lsc.Configuration;
 import org.lsc.LscDatasets;
 import org.lsc.configuration.DatabaseConnectionType;
 import org.lsc.configuration.DatabaseSourceServiceType;
 import org.lsc.configuration.TaskType;
-import org.lsc.exception.LscConfigurationException;
-import org.lsc.exception.LscServiceConfigurationException;
 import org.lsc.exception.LscServiceException;
 import org.lsc.exception.LscServiceInitializationException;
-import org.lsc.persistence.DaoConfig;
 
 /**
  * @author Jonathan Clarke &lt;jonathan@phillipoux.net&gt;

diff --git a/src/main/java/org/lsc/service/SyncReplSourceService.java b/src/main/java/org/lsc/service/SyncReplSourceService.java
@@ -57,9 +57,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -90,11 +88,7 @@
 import org.apache.directory.ldap.client.api.future.SearchFuture;
 import org.lsc.LscDatasets;
 import org.lsc.beans.IBean;
-import org.lsc.configuration.AsyncLdapSourceServiceType;
-import org.lsc.configuration.LdapConnectionType;
-import org.lsc.configuration.LdapDerefAliasesType;
-import org.lsc.configuration.LdapServerType;
-import org.lsc.configuration.TaskType;
+import org.lsc.configuration.*;
 import org.lsc.exception.LscServiceCommunicationException;
 import org.lsc.exception.LscServiceConfigurationException;
 import org.lsc.exception.LscServiceException;

diff --git a/src/test/java/org/lsc/beans/BeanComparatorTest.java b/src/test/java/org/lsc/beans/BeanComparatorTest.java
@@ -68,10 +68,10 @@
 import org.junit.Test;
 import org.lsc.LscModificationType;
 import org.lsc.LscModifications;
+import org.lsc.Task;
 import org.lsc.beans.syncoptions.ISyncOptions;
 import org.lsc.configuration.PolicyType;
 import org.lsc.exception.LscServiceException;
-import org.lsc.jndi.JndiModificationType;
 import org.lsc.utils.SetUtils;
 
 /**
@@ -84,8 +84,8 @@ public class BeanComparatorTest {
     @Mocked org.lsc.jndi.SimpleJndiDstService dstService;
 
 	/**
-	 * Test method for {@link org.lsc.beans.BeanComparator#calculateModificationType(ISyncOptions, IBean, IBean, Object)}.
-	 * @throws CloneNotSupportedException As thrown by {@link org.lsc.beans.BeanComparator#calculateModificationType(ISyncOptions, IBean, IBean, Object)}.
+	 * Test method for {@link org.lsc.beans.BeanComparator#calculateModificationType(Task, IBean, IBean)}.
+	 * @throws CloneNotSupportedException As thrown by {@link org.lsc.beans.BeanComparator#calculateModificationType(Task, IBean, IBean)}.
 	 * @throws LscServiceException 
 	 */
 	@Test
@@ -141,7 +141,7 @@ public void testCalculateModificationType() throws CloneNotSupportedException, L
 	 *
 	 * With an invalid syntax error.
 	 * @throws NamingException As thrown when reading JNDI Attribute values.
-	 * @throws CloneNotSupportedException As thrown by {@link org.lsc.beans.BeanComparator#calculateModificationType(ISyncOptions, IBean, IBean, Object)}.
+	 * @throws CloneNotSupportedException As thrown by {@link org.lsc.beans.BeanComparator#calculateModificationType(Task, IBean, IBean)}.
 	 * @throws LscServiceException 
 	 */
 	@Test
@@ -210,7 +210,7 @@ public void testCalculateModificationsWithEmptyFieldsModify() throws NamingExcep
 	}
 
 	/**
-	 * Test method for {@link org.lsc.beans.BeanComparator#getValuesToSet(String, Set, ISyncOptions, Map, JndiModificationType)}.
+	 * Test method for {@link org.lsc.beans.BeanComparator#getValuesToSet(Task, String, Set, Set, Map, LscModificationType)}.
 	 * @throws LscServiceException 
 	 */
 	@Test

diff --git a/src/test/java/org/lsc/beans/syncoptions/ForceSyncOptionsTest.java b/src/test/java/org/lsc/beans/syncoptions/ForceSyncOptionsTest.java
@@ -49,6 +49,7 @@
 
 import org.junit.Test;
 import org.lsc.configuration.PolicyType;
+
 /**
  * Simple tests.
  */

diff --git a/src/test/java/org/lsc/beans/syncoptions/PropertiesBasedSyncOptionsTest.java b/src/test/java/org/lsc/beans/syncoptions/PropertiesBasedSyncOptionsTest.java
@@ -55,11 +55,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.lsc.configuration.DatasetType;
-import org.lsc.configuration.PolicyType;
-import org.lsc.configuration.PropertiesBasedSyncOptionsType;
-import org.lsc.configuration.TaskType;
-import org.lsc.configuration.ValuesType;
+import org.lsc.configuration.*;
 import org.lsc.exception.LscServiceException;
 import org.lsc.utils.ScriptingEvaluator;
 
@@ -72,7 +68,8 @@ public class PropertiesBasedSyncOptionsTest {
 	PropertiesBasedSyncOptionsType conf ;
 	DatasetType pbsoNonExistingAttr;
 	DatasetType pbsoExistingAttr;
-	@Injectable @NonStrict TaskType task;
+	@Injectable @NonStrict
+	TaskType task;
 	@Injectable @NonStrict org.lsc.Task taskExec;
 
 	@Before

diff --git a/src/test/java/org/lsc/connectors/xmlrpc/XmlRpcUserProvisioning.java b/src/test/java/org/lsc/connectors/xmlrpc/XmlRpcUserProvisioning.java
@@ -242,7 +242,7 @@ public List<String> getWriteDatasetIds() {
 	}
 
     /**
-     * @see org.lsc.service.IService.getSupportedConnectionType()
+     * @see org.lsc.service.IService#getSupportedConnectionType()
      */
     public Collection<Class<? extends ConnectionType>> getSupportedConnectionType() {
         Collection<Class<? extends ConnectionType>> list = new ArrayList<Class<? extends ConnectionType>>();