Fixed javadocs warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1d075ec1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1d075ec1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1d075ec1 Branch: refs/heads/feature-UNOMI-117 Commit: 1d075ec19850466a355ecffc1dfed2da049e25c9 Parents: 514eac0 Author: Thomas Draier <[email protected]> Authored: Wed Aug 30 15:02:26 2017 +0200 Committer: Thomas Draier <[email protected]> Committed: Wed Aug 30 15:02:26 2017 +0200 ---------------------------------------------------------------------- .../org/apache/unomi/api/ContextResponse.java | 2 +- .../main/java/org/apache/unomi/api/Profile.java | 2 ++ .../java/org/apache/unomi/api/PropertyType.java | 2 +- .../java/org/apache/unomi/api/ValueType.java | 2 +- .../apache/unomi/api/actions/ActionType.java | 1 + .../unomi/api/conditions/ConditionType.java | 1 + .../unomi/api/services/DefinitionsService.java | 6 ++--- .../apache/unomi/api/services/EventService.java | 10 ++++---- .../unomi/api/services/ProfileService.java | 5 ++++ .../unomi/api/services/SegmentService.java | 3 +++ .../unomi/router/api/ImportConfiguration.java | 4 ++-- .../router/api/ImportExportConfiguration.java | 5 +++- .../unomi/router/api/ImportLineError.java | 6 ++--- .../AbstractConfigurationServiceEndpoint.java | 3 ++- .../ExportConfigurationServiceEndPoint.java | 1 + .../ImportConfigurationServiceEndPoint.java | 2 ++ .../persistence/spi/PersistenceService.java | 25 ++++++++++++++++---- .../apache/unomi/rest/LocalizationHelper.java | 8 ++++++- .../unomi/rest/ProfileServiceEndPoint.java | 4 ++-- .../NonEmptyPropertyMergeStrategyExecutor.java | 2 +- .../OldestPropertyMergeStrategyExecutor.java | 2 +- 21 files changed, 70 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/ContextResponse.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/ContextResponse.java b/api/src/main/java/org/apache/unomi/api/ContextResponse.java index b0a871c..58bcadd 100644 --- a/api/src/main/java/org/apache/unomi/api/ContextResponse.java +++ b/api/src/main/java/org/apache/unomi/api/ContextResponse.java @@ -198,7 +198,7 @@ public class ContextResponse implements Serializable { /** * Set the user anonymous browsing status - * @param anonymousBrowsing + * @param anonymousBrowsing new value for anonymousBrowsing */ public void setAnonymousBrowsing(boolean anonymousBrowsing) { this.anonymousBrowsing = anonymousBrowsing; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/Profile.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/Profile.java b/api/src/main/java/org/apache/unomi/api/Profile.java index 4490bb1..8c20adc 100644 --- a/api/src/main/java/org/apache/unomi/api/Profile.java +++ b/api/src/main/java/org/apache/unomi/api/Profile.java @@ -173,6 +173,7 @@ public class Profile extends Item { /** * TODO: should be removed from the API + * @param mergedWith new value for mergedWith */ public void setMergedWith(String mergedWith) { this.mergedWith = mergedWith; @@ -189,6 +190,7 @@ public class Profile extends Item { /** * TODO: should be removed from the API + * @param scores new value for scores */ public void setScores(Map<String, Integer> scores) { this.scores = scores; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/PropertyType.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/PropertyType.java b/api/src/main/java/org/apache/unomi/api/PropertyType.java index 8b9a231..7c5b7c9 100644 --- a/api/src/main/java/org/apache/unomi/api/PropertyType.java +++ b/api/src/main/java/org/apache/unomi/api/PropertyType.java @@ -168,7 +168,7 @@ public class PropertyType extends MetadataItem { * Sets the identifiers of the tags used by this PropertyType. * * @param tagIds the identifiers of the tags used by this PropertyType - * @deprecated will be rename to setTags(Set<String> tags) in next major release as tag become an open string + * @deprecated will be rename to setTags(Set<String> tags) in next major release as tag become an open string */ @Deprecated public void setTagIds(Set<String> tagIds) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/ValueType.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/ValueType.java b/api/src/main/java/org/apache/unomi/api/ValueType.java index d56f7aa..faf2a16 100644 --- a/api/src/main/java/org/apache/unomi/api/ValueType.java +++ b/api/src/main/java/org/apache/unomi/api/ValueType.java @@ -161,7 +161,7 @@ public class ValueType implements PluginType { * Sets the identifiers of the tags used by this ValueType. * * @param tagIds the identifiers of the tags used by this ValueType - * @deprecated will be rename to setTags(Set<String> tags) in next major release as tag become an open string + * @deprecated will be rename to setTags(Set<String> tags) in next major release as tag become an open string */ @Deprecated public void setTagIds(Set<String> tagIds) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/actions/ActionType.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/actions/ActionType.java b/api/src/main/java/org/apache/unomi/api/actions/ActionType.java index 941e917..3affba4 100644 --- a/api/src/main/java/org/apache/unomi/api/actions/ActionType.java +++ b/api/src/main/java/org/apache/unomi/api/actions/ActionType.java @@ -42,6 +42,7 @@ public class ActionType extends MetadataItem { /** * Instantiates a new Action type. + * @param metadata the metadata */ public ActionType(Metadata metadata) { super(metadata); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java b/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java index b2351c9..4fd8354 100644 --- a/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java +++ b/api/src/main/java/org/apache/unomi/api/conditions/ConditionType.java @@ -50,6 +50,7 @@ public class ConditionType extends MetadataItem { /** * Instantiates a new Condition type with the specified metadata + * @param metadata the metadata */ public ConditionType(Metadata metadata) { super(metadata); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java b/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java index ca1f3da..500fbd2 100644 --- a/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java +++ b/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java @@ -232,9 +232,9 @@ public interface DefinitionsService { * TODO: remove from API and move to a different class? * TODO: purpose and behavior not clear * - * @param rootCondition - * @param tagId - * @return + * @param rootCondition root condition + * @param tagId tag to extract + * @return condition */ Condition extractConditionByTag(Condition rootCondition, String tagId); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/services/EventService.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/services/EventService.java b/api/src/main/java/org/apache/unomi/api/services/EventService.java index 5e74e83..c3a09d3 100644 --- a/api/src/main/java/org/apache/unomi/api/services/EventService.java +++ b/api/src/main/java/org/apache/unomi/api/services/EventService.java @@ -57,15 +57,17 @@ public interface EventService { /** * Check if the sender is allowed to sent the speecified event. Restricted event must be explicitely allowed for a sender. - * @param event - * @param thirdPartyId - * @return + * @param event event to test + * @param thirdPartyId third party id + * @return true if the event is allowed */ boolean isEventAllowed(Event event, String thirdPartyId); /** * Get the third party server name, if the request is originated from a known peer - * @return + * @param key the key + * @param ip the ip + * @return server name */ String authenticateThirdPartyServer(String key, String ip); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/services/ProfileService.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/services/ProfileService.java b/api/src/main/java/org/apache/unomi/api/services/ProfileService.java index e7e2369..b544e88 100644 --- a/api/src/main/java/org/apache/unomi/api/services/ProfileService.java +++ b/api/src/main/java/org/apache/unomi/api/services/ProfileService.java @@ -230,6 +230,7 @@ public interface ProfileService { * Save a persona with its sessions. * * @param personaToSave the persona object containing all the persona information and sessions + * @return the persona with sessions */ PersonaWithSessions savePersonaWithSessions(PersonaWithSessions personaToSave); @@ -279,11 +280,15 @@ public interface ProfileService { /** * TODO + * @param fromPropertyTypeId fromPropertyTypeId + * @return property type mapping */ String getPropertyTypeMapping(String fromPropertyTypeId); /** * TODO + * @param propertyName the property name + * @return list of property types */ Collection<PropertyType> getPropertyTypeByMapping(String propertyName); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/api/src/main/java/org/apache/unomi/api/services/SegmentService.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/unomi/api/services/SegmentService.java b/api/src/main/java/org/apache/unomi/api/services/SegmentService.java index a1affd6..4b03e78 100644 --- a/api/src/main/java/org/apache/unomi/api/services/SegmentService.java +++ b/api/src/main/java/org/apache/unomi/api/services/SegmentService.java @@ -157,6 +157,9 @@ public interface SegmentService { /** * Retrieves the set of all scoring metadata. * + * @param offset the offset + * @param size the size + * @param sortBy sort by * @return the set of all scoring metadata */ PartialList<Metadata> getScoringMetadatas(int offset, int size, String sortBy); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java index 2916b8b..fd04756 100644 --- a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java +++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java @@ -95,7 +95,7 @@ public class ImportConfiguration extends ImportExportConfiguration { /** * Sets the hasHeader flag. * - * @param hasHeader + * @param hasHeader new value for hasHeader */ public void setHasHeader(boolean hasHeader) { this.hasHeader = hasHeader; @@ -113,7 +113,7 @@ public class ImportConfiguration extends ImportExportConfiguration { /** * Sets the hasDeleteColumn flag. * - * @param hasDeleteColumn + * @param hasDeleteColumn new value for hasDeleteColumn */ public void setHasDeleteColumn(boolean hasDeleteColumn) { this.hasDeleteColumn = hasDeleteColumn; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportExportConfiguration.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportExportConfiguration.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportExportConfiguration.java index 7beb194..10209bd 100644 --- a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportExportConfiguration.java +++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportExportConfiguration.java @@ -152,6 +152,7 @@ public class ImportExportConfiguration extends Item { /** * Retrieves the column separator. + * @return column separator */ public String getColumnSeparator() { return this.columnSeparator; @@ -169,6 +170,7 @@ public class ImportExportConfiguration extends Item { /** * Retrieves the line separator. + * @return the line separator */ public String getLineSeparator() { return this.lineSeparator; @@ -224,6 +226,7 @@ public class ImportExportConfiguration extends Item { /** * Retrieves the executions + * @return executions */ public List<Map<String, Object>> getExecutions() { return this.executions; @@ -232,7 +235,7 @@ public class ImportExportConfiguration extends Item { /** * Sets the executions - * @param executions + * @param executions executions */ public void setExecutions(List<Map<String, Object>> executions) { this.executions = executions; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportLineError.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportLineError.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportLineError.java index 822352d..1e7fb76 100644 --- a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportLineError.java +++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportLineError.java @@ -36,7 +36,7 @@ public class ImportLineError { /** * Sets the number of the line which failed to be imported - * @param lineNb + * @param lineNb new value for lineNb */ public void setLineNb(long lineNb) { this.lineNb = lineNb; @@ -52,7 +52,7 @@ public class ImportLineError { /** * Sets the error code - * @param errorCode + * @param errorCode new value for errorCode */ public void setErrorCode(String errorCode) { this.errorCode = errorCode; @@ -68,7 +68,7 @@ public class ImportLineError { /** * Sets the line content - * @param lineContent + * @param lineContent cd per new value for lineContent */ public void setLineContent(String lineContent) { this.lineContent = lineContent; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/AbstractConfigurationServiceEndpoint.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/AbstractConfigurationServiceEndpoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/AbstractConfigurationServiceEndpoint.java index 87e2509..89b4b0c 100644 --- a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/AbstractConfigurationServiceEndpoint.java +++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/AbstractConfigurationServiceEndpoint.java @@ -59,6 +59,7 @@ public abstract class AbstractConfigurationServiceEndpoint<T> { /** * Retrieves a configuration by id. * + * @param configId config id * @return the configuration that matches the given id. */ @GET @@ -72,7 +73,7 @@ public abstract class AbstractConfigurationServiceEndpoint<T> { /** * Delete a configuration by id. * - * @return the deleted configuration. + * @param configId config id */ @DELETE @Path("/{configId}") http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java index 72070df..9995668 100644 --- a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java +++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java @@ -111,6 +111,7 @@ public class ExportConfigurationServiceEndPoint extends AbstractConfigurationSer * Save/Update the given import configuration. * Prepare the file to be processed with Camel routes * + * @param exportConfiguration configuration * @return OK / NOK Http Code. */ @POST http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java index 594d8f2..d480c1f 100644 --- a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java +++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java @@ -101,6 +101,8 @@ public class ImportConfigurationServiceEndPoint extends AbstractConfigurationSer * Save/Update the given import configuration. * Prepare the file to be processed with Camel routes * + * @param file file + * @param importConfigId config * @return OK / NOK Http Code. */ @POST http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PersistenceService.java ---------------------------------------------------------------------- diff --git a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PersistenceService.java b/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PersistenceService.java index 1397659..332d220 100644 --- a/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PersistenceService.java +++ b/persistence-spi/src/main/java/org/apache/unomi/persistence/spi/PersistenceService.java @@ -192,7 +192,7 @@ public interface PersistenceService { * This method may not return any results if the implementation doesn't support property type mappings * * @param itemType the itemType we want to retrieve the mappings for - * @return + * @return properties mapping */ Map<String, Map<String, Object>> getPropertiesMapping(String itemType); @@ -201,15 +201,15 @@ public interface PersistenceService { * * @param property the property name (can use nested dot notation) * @param itemType the itemType we want to retrieve the mappings for - * @return + * @return property mapping */ Map<String, Object> getPropertyMapping(String property, String itemType); /** * Create mapping - * @param type - * @param source + * @param type the type + * @param source the source */ void createMapping(String type, String source); @@ -228,6 +228,15 @@ public interface PersistenceService { * Same as {@code query(fieldName, fieldValue, sortBy, clazz, 0, -1).getList()} * * @see #query(Condition, String, Class, int, int) + * @param <T> the type of the Item subclass we want to retrieve + * @param fieldName the name of the field which we want items to have the specified values + * @param fieldValue the value the items to retrieve should have for the specified field + * @param sortBy an optional ({@code null} if no sorting is required) String of comma ({@code ,}) separated property names on which ordering should be performed, ordering + * elements according to the property order in the + * String, considering each in turn and moving on to the next one in case of equality of all preceding ones. Each property name is optionally followed by + * a column ({@code :}) and an order specifier: {@code asc} or {@code desc}. + * @param clazz the {@link Item} subclass of the items we want to retrieve + * @return a list of items matching the specified criteria */ <T extends Item> List<T> query(String fieldName, String fieldValue, String sortBy, Class<T> clazz); @@ -300,6 +309,14 @@ public interface PersistenceService { /** * Same as {@code query(query, sortBy, clazz, 0, -1).getList()} * + * @param <T> the type of the Item subclass we want to retrieve + * @param query the {@link Condition} the items must satisfy to be retrieved + * @param sortBy an optional ({@code null} if no sorting is required) String of comma ({@code ,}) separated property names on which ordering should be performed, ordering + * elements according to the property order in the + * String, considering each in turn and moving on to the next one in case of equality of all preceding ones. Each property name is optionally followed by + * a column ({@code :}) and an order specifier: {@code asc} or {@code desc}. + * @param clazz the {@link Item} subclass of the items we want to retrieve + * @return a {@link PartialList} of items matching the specified criteria * @see #query(Condition, String, Class, int, int) */ <T extends Item> List<T> query(Condition query, String sortBy, Class<T> clazz); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java ---------------------------------------------------------------------- diff --git a/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java b/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java index 6cb5d89..bed42e8 100644 --- a/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java +++ b/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java @@ -129,7 +129,7 @@ public class LocalizationHelper { * Creates a {@link RESTParameter} based on the specified {@link Parameter} and localized using the specified {@link ResourceBundle}. * * @param parameter the {@link Parameter} to be localized - * @param language + * @param language the language * @return a {@link RESTParameter} based on the specified {@link ActionType} and localized using the specified {@link ResourceBundle} */ public RESTParameter generateParameter(Parameter parameter, String language) { @@ -179,6 +179,9 @@ public class LocalizationHelper { /** * Same as generateTages(tags, language, false). + * @param tags the tag + * @param language the language + * @return list of tags */ public Collection<RESTTag> generateTags(Collection<Tag> tags, String language) { return generateTags(tags, language, false); @@ -205,6 +208,9 @@ public class LocalizationHelper { /** * Same as generateTag(tag, language, false). + * @param tag the tag + * @param language the language + * @return tag */ public RESTTag generateTag(Tag tag, String language) { return generateTag(tag, language, false); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java ---------------------------------------------------------------------- diff --git a/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java b/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java index 1454afe..39e94e6 100644 --- a/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java +++ b/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java @@ -260,8 +260,8 @@ public class ProfileServiceEndPoint { /** * TODO * - * @param fromPropertyTypeId - * @return + * @param fromPropertyTypeId fromPropertyTypeId + * @return property type mapping */ @GET @Path("/properties/mappings/{fromPropertyTypeId}") http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/services/src/main/java/org/apache/unomi/services/mergers/NonEmptyPropertyMergeStrategyExecutor.java ---------------------------------------------------------------------- diff --git a/services/src/main/java/org/apache/unomi/services/mergers/NonEmptyPropertyMergeStrategyExecutor.java b/services/src/main/java/org/apache/unomi/services/mergers/NonEmptyPropertyMergeStrategyExecutor.java index 4f74851..e669ec0 100644 --- a/services/src/main/java/org/apache/unomi/services/mergers/NonEmptyPropertyMergeStrategyExecutor.java +++ b/services/src/main/java/org/apache/unomi/services/mergers/NonEmptyPropertyMergeStrategyExecutor.java @@ -24,7 +24,7 @@ import org.apache.unomi.api.PropertyType; import java.util.List; /** - * @todo not yet implemented ! + * todo not yet implemented ! */ public class NonEmptyPropertyMergeStrategyExecutor implements PropertyMergeStrategyExecutor { public boolean mergeProperty(String propertyName, PropertyType propertyType, List<Profile> profilesToMerge, Profile targetProfile) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1d075ec1/services/src/main/java/org/apache/unomi/services/mergers/OldestPropertyMergeStrategyExecutor.java ---------------------------------------------------------------------- diff --git a/services/src/main/java/org/apache/unomi/services/mergers/OldestPropertyMergeStrategyExecutor.java b/services/src/main/java/org/apache/unomi/services/mergers/OldestPropertyMergeStrategyExecutor.java index 6f91448..b938499 100644 --- a/services/src/main/java/org/apache/unomi/services/mergers/OldestPropertyMergeStrategyExecutor.java +++ b/services/src/main/java/org/apache/unomi/services/mergers/OldestPropertyMergeStrategyExecutor.java @@ -24,7 +24,7 @@ import org.apache.unomi.api.PropertyType; import java.util.List; /** - * @todo not yet implemented ! + * todo not yet implemented ! */ public class OldestPropertyMergeStrategyExecutor implements PropertyMergeStrategyExecutor { public boolean mergeProperty(String propertyName, PropertyType propertyType, List<Profile> profilesToMerge, Profile targetProfile) {
