diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/AbstractKapuaConfigurableResourceLimitedService.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/AbstractKapuaConfigurableResourceLimitedService.java index 719a0a0addf..616290f3751 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/AbstractKapuaConfigurableResourceLimitedService.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/AbstractKapuaConfigurableResourceLimitedService.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.kapua.commons.configuration; +import java.util.Map; +import java.util.Optional; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.KapuaMaxNumberOfItemsReachedException; import org.eclipse.kapua.commons.configuration.exception.ServiceConfigurationLimitExceededException; @@ -36,9 +39,6 @@ import org.eclipse.kapua.service.authorization.permission.PermissionFactory; import org.eclipse.kapua.service.config.KapuaConfigurableService; -import java.util.Map; -import java.util.Optional; - /** * Base {@code abstract} {@link KapuaConfigurableService} implementation for services that have a max number of entities allowed. *

@@ -48,12 +48,18 @@ *

  • maxNumberChildEntities
    • * * - * @param The {@link KapuaEntity} type. - * @param The {@link KapuaEntityCreator} type. - * @param The {@link KapuaEntityService} type. - * @param The {@link KapuaListResult} type. - * @param The {@link KapuaQuery} type. - * @param The {@link KapuaEntityFactory} type. + * @param + * The {@link KapuaEntity} type. + * @param + * The {@link KapuaEntityCreator} type. + * @param + * The {@link KapuaEntityService} type. + * @param + * The {@link KapuaListResult} type. + * @param + * The {@link KapuaQuery} type. + * @param + * The {@link KapuaEntityFactory} type. * @since 1.0.0 * @deprecated since 2.0.0, in favour of separate configuration component - see {@link ServiceConfigurationManager} and implementations for more details */ @@ -62,14 +68,12 @@ public abstract class AbstractKapuaConfigurableResourceLimitedService< E extends KapuaEntity, C extends KapuaEntityCreator, S extends KapuaEntityService, - L extends KapuaListResult, Q extends KapuaQuery, - F extends KapuaEntityFactory + F extends KapuaEntityFactory > extends AbstractKapuaConfigurableService implements KapuaEntityService { - //TODO: make final as soon as deprecated constructors are removed private AccountRelativeFinder accountRelativeFinder; private F factory; @@ -79,11 +83,16 @@ public abstract class AbstractKapuaConfigurableResourceLimitedService< /** * Constructor. * - * @param pid The {@link KapuaConfigurableService} id. - * @param domain The {@link Domain} on which check access. - * @param entityManagerFactory The {@link EntityManagerFactory} that handles persistence unit - * @param serviceClass The {@link KapuaService} type. - * @param factoryClass The {@link KapuaEntityFactory} type. + * @param pid + * The {@link KapuaConfigurableService} id. + * @param domain + * The {@link Domain} on which check access. + * @param entityManagerFactory + * The {@link EntityManagerFactory} that handles persistence unit + * @param serviceClass + * The {@link KapuaService} type. + * @param factoryClass + * The {@link KapuaEntityFactory} type. * @deprecated Since 1.2.0. This constructor will be removed in a next release (may be) */ @Deprecated @@ -104,12 +113,18 @@ protected AbstractKapuaConfigurableResourceLimitedService( /** * Constructor. * - * @param pid The {@link KapuaConfigurableService} id. - * @param domain The {@link Domain} on which check access. - * @param entityManagerFactory The {@link EntityManagerFactory} that handles persistence unit - * @param abstractCacheFactory The {@link CacheFactory} that handles caching of the entities + * @param pid + * The {@link KapuaConfigurableService} id. + * @param domain + * The {@link Domain} on which check access. + * @param entityManagerFactory + * The {@link EntityManagerFactory} that handles persistence unit + * @param abstractCacheFactory + * The {@link CacheFactory} that handles caching of the entities * @since 1.2.0 - * @deprecated Since 2.0.0. Please use {@link #AbstractKapuaConfigurableResourceLimitedService(String, Domain, EntityManagerFactory, EntityCacheFactory, KapuaEntityFactory, PermissionFactory, AuthorizationService, AccountRelativeFinder, RootUserTester)} This constructor may be removed in a next release + * @deprecated Since 2.0.0. Please use + * {@link #AbstractKapuaConfigurableResourceLimitedService(String, Domain, EntityManagerFactory, EntityCacheFactory, KapuaEntityFactory, PermissionFactory, AuthorizationService, + * AccountRelativeFinder, RootUserTester)} This constructor may be removed in a next release */ @Deprecated protected AbstractKapuaConfigurableResourceLimitedService( @@ -133,24 +148,32 @@ protected AbstractKapuaConfigurableResourceLimitedService( /** * Constructor. * - * @param pid The {@link KapuaConfigurableService} id. - * @param domain The {@link Domain} on which check access. - * @param entityManagerFactory The {@link EntityManagerFactory} that handles persistence unit - * @param abstractCacheFactory The {@link CacheFactory} that handles caching of the entities - * @param factory The {@link KapuaEntityFactory} instance. - * @param permissionFactory The {@link PermissionFactory} instance. - * @param authorizationService The {@link AuthorizationService} instance. - * @param rootUserTester The {@link RootUserTester} instance. + * @param pid + * The {@link KapuaConfigurableService} id. + * @param domain + * The {@link Domain} on which check access. + * @param entityManagerFactory + * The {@link EntityManagerFactory} that handles persistence unit + * @param abstractCacheFactory + * The {@link CacheFactory} that handles caching of the entities + * @param factory + * The {@link KapuaEntityFactory} instance. + * @param permissionFactory + * The {@link PermissionFactory} instance. + * @param authorizationService + * The {@link AuthorizationService} instance. + * @param rootUserTester + * The {@link RootUserTester} instance. */ protected AbstractKapuaConfigurableResourceLimitedService(String pid, - Domain domain, - EntityManagerFactory entityManagerFactory, - EntityCacheFactory abstractCacheFactory, - F factory, - PermissionFactory permissionFactory, - AuthorizationService authorizationService, - AccountRelativeFinder accountRelativeFinder, - RootUserTester rootUserTester) { + Domain domain, + EntityManagerFactory entityManagerFactory, + EntityCacheFactory abstractCacheFactory, + F factory, + PermissionFactory permissionFactory, + AuthorizationService authorizationService, + AccountRelativeFinder accountRelativeFinder, + RootUserTester rootUserTester) { super(pid, domain, entityManagerFactory, abstractCacheFactory, permissionFactory, authorizationService, rootUserTester); this.factory = factory; this.factoryClass = null; //TODO: not needed for this construction path, remove as soon as the deprecated constructor is removed @@ -180,8 +203,10 @@ protected boolean validateNewConfigValuesCoherence(KapuaTocd ocd, Map * The exclusion of the scope is required when updating a limit for a target account. * - * @param scopeId The scope {@link KapuaId}. - * @param targetScopeId The excluded scope {@link KapuaId}. + * @param scopeId + * The scope {@link KapuaId}. + * @param targetScopeId + * The excluded scope {@link KapuaId}. * @return The number of entities remaining for the given scope * @throws KapuaException * @since 1.0.0 @@ -220,14 +248,16 @@ private long allowedChildEntities(KapuaId scopeId, KapuaId targetScopeId) throws } /** - * Gets the number of remaining allowed entity for the given scope, according to the given {@link KapuaConfigurableService} - * excluding a specific scope when checking resources available. + * Gets the number of remaining allowed entity for the given scope, according to the given {@link KapuaConfigurableService} excluding a specific scope when checking resources available. *

    * The exclusion of the scope is required when updating a limit for a target account. * - * @param scopeId The scope {@link KapuaId}. - * @param targetScopeId The excluded scope {@link KapuaId}. - * @param configuration The configuration to be checked. If not provided will be read from the current service configuration + * @param scopeId + * The scope {@link KapuaId}. + * @param targetScopeId + * The excluded scope {@link KapuaId}. + * @param configuration + * The configuration to be checked. If not provided will be read from the current service configuration * @return The number of entities remaining for the given scope * @throws KapuaException * @since 1.0.0 @@ -263,10 +293,9 @@ private long allowedChildEntities(KapuaId scopeId, KapuaId targetScopeId, Map getConfigValues(KapuaId scopeId, boolean excludeDi ); ServiceConfigListResult result = entityManagerSession.doAction(EntityManagerContainer.create() - .onResultHandler(em -> ServiceDAO.query(em, ServiceConfig.class, ServiceConfigImpl.class, new ServiceConfigListResultImpl(), query)) + .onResultHandler(em -> ServiceDAO.query(em, ServiceConfig.class, ServiceConfigImpl.class, new ServiceConfigListResult(), query)) .onBeforeHandler(() -> (ServiceConfigListResult) PRIVATE_ENTITY_CACHE.getList(scopeId, pid)) .onAfterHandler(entity -> PRIVATE_ENTITY_CACHE.putList(scopeId, pid, entity))); @@ -592,7 +592,7 @@ public void setConfigValues(KapuaId scopeId, KapuaId parentId, Mapcreate(). - onResultHandler(em -> ServiceDAO.query(em, ServiceConfig.class, ServiceConfigImpl.class, new ServiceConfigListResultImpl(), query)) + onResultHandler(em -> ServiceDAO.query(em, ServiceConfig.class, ServiceConfigImpl.class, new ServiceConfigListResult(), query)) ); Properties props = toProperties(values); diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigImplJpaRepository.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigImplJpaRepository.java index 31b63e33cab..438de108ee4 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigImplJpaRepository.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigImplJpaRepository.java @@ -22,7 +22,7 @@ public class ServiceConfigImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements ServiceConfigRepository { public ServiceConfigImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(ServiceConfigImpl.class, ServiceConfig.TYPE, () -> new ServiceConfigListResultImpl(), jpaRepoConfig); + super(ServiceConfigImpl.class, ServiceConfig.TYPE, () -> new ServiceConfigListResult(), jpaRepoConfig); } @Override diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResult.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResult.java index 5701270b445..22229c46b19 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResult.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResult.java @@ -18,7 +18,9 @@ * Service configuration result list definition. * * @since 1.0 - * */ -public interface ServiceConfigListResult extends KapuaListResult { +public class ServiceConfigListResult extends KapuaListResult { + + private static final long serialVersionUID = -2550359084026132096L; + } diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResultImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResultImpl.java deleted file mode 100644 index 79136d21865..00000000000 --- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.commons.configuration; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; - -/** - * Service configuration result list reference implementation. - * - * @since 1.0 - * - */ -public class ServiceConfigListResultImpl extends KapuaListResultImpl implements ServiceConfigListResult { - - private static final long serialVersionUID = -2550359084026132096L; -} diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/UsedEntitiesCounterImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/UsedEntitiesCounterImpl.java index 227dccac161..4b0e24d0251 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/UsedEntitiesCounterImpl.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/UsedEntitiesCounterImpl.java @@ -28,14 +28,14 @@ public class UsedEntitiesCounterImpl< C extends KapuaEntityCreator, L extends KapuaListResult, Q extends KapuaQuery, - F extends KapuaEntityFactory + F extends KapuaEntityFactory > implements UsedEntitiesCounter { private final F factory; private final KapuaEntityRepository entityRepository; public UsedEntitiesCounterImpl(F factory, - KapuaEntityRepository entityRepository) { + KapuaEntityRepository entityRepository) { this.factory = factory; this.entityRepository = entityRepository; } diff --git a/commons/src/main/java/org/eclipse/kapua/commons/model/query/KapuaListResultImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/model/query/KapuaListResultImpl.java deleted file mode 100644 index 3ff330435d3..00000000000 --- a/commons/src/main/java/org/eclipse/kapua/commons/model/query/KapuaListResultImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.commons.model.query; - -import org.eclipse.kapua.model.KapuaEntity; -import org.eclipse.kapua.model.query.KapuaListResult; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * {@link KapuaListResult} implementation. - * - * @param {@link KapuaEntity} type. - * @since 1.0.0 - */ -public class KapuaListResultImpl implements KapuaListResult { - - private static final long serialVersionUID = 8939666089540269261L; - - private ArrayList items; - private boolean limitExceeded; - private Long totalCount; - - /** - * Constructor. - * - * @since 1.0.0 - */ - public KapuaListResultImpl() { - limitExceeded = false; - } - - @Override - public boolean isLimitExceeded() { - return limitExceeded; - } - - @Override - public void setLimitExceeded(boolean limitExceeded) { - this.limitExceeded = limitExceeded; - } - - @Override - public List getItems() { - if (items == null) { - items = new ArrayList<>(); - } - - return items; - } - - @Override - public List getItems(Predicate filter) { - return getItems().stream().filter(filter).collect(Collectors.toList()); - } - - @Override - public Map getItemsAsMap(Function keyMapper) { - return getItems().stream().collect(Collectors.toMap(keyMapper, e -> e)); - } - - @Override - public Map getItemsAsMap(Function keyMapper, Function valueMapper) { - return getItems().stream().collect(Collectors.toMap(keyMapper, valueMapper)); - } - - @Override - public E getItem(int index) { - return getItems().get(index); - } - - @Override - public E getFirstItem() { - return this.isEmpty() ? null : getItem(0); - } - - @Override - public int getSize() { - return getItems().size(); - } - - @Override - public boolean isEmpty() { - return getItems().isEmpty(); - } - - @Override - public void addItems(Collection items) { - getItems().addAll(items); - } - - @Override - public void addItem(E item) { - getItems().add(item); - } - - @Override - public void clearItems() { - getItems().clear(); - } - - @Override - public void sort(Comparator comparator) { - getItems().sort(comparator); - } - - @Override - public Long getTotalCount() { - return totalCount; - } - - @Override - public void setTotalCount(Long totalCount) { - this.totalCount = totalCount; - } - -} diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreFactory.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreFactory.java index d26edcfbaca..944d14d51db 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreFactory.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface EventStoreFactory extends KapuaEntityFactory { +public interface EventStoreFactory extends KapuaEntityFactory { } diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreRecordListResult.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreRecordListResult.java index 1ca0de04f84..604c3b771ea 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreRecordListResult.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreRecordListResult.java @@ -23,11 +23,12 @@ * KapuaEvent result list definition. * * @since 1.0 - * */ @XmlRootElement(name = "eventStoreRecords") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = EventStoreXmlRegistry.class,factoryMethod = "newEventStoreRecordListResult") -public interface EventStoreRecordListResult extends KapuaListResult { +@XmlType +public class EventStoreRecordListResult extends KapuaListResult { + + private static final long serialVersionUID = -5118004898345748297L; } diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreXmlRegistry.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreXmlRegistry.java index 39fd356fa6b..0ea0521588e 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreXmlRegistry.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/api/EventStoreXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.commons.service.event.store.api; -import org.eclipse.kapua.commons.service.event.store.internal.EventStoreFactoryImpl; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.commons.service.event.store.internal.EventStoreFactoryImpl; + @XmlRegistry public class EventStoreXmlRegistry { @@ -39,15 +39,6 @@ public EventStoreRecordCreator newEventStoreRecordCreator() { return kapuaEventFactory.newCreator(null); } - /** - * Creates a new kapuaEvent list result instance - * - * @return - */ - public EventStoreRecordListResult newEventStoreRecordListResult() { - return kapuaEventFactory.newListResult(); - } - public EventStoreRecordQuery newQuery() { return kapuaEventFactory.newQuery(null); } diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImpl.java index e5622dfc59c..c6b25def06f 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImpl.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.commons.service.event.store.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.commons.service.event.store.api.EventStoreFactory; import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecord; import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordCreator; -import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordListResult; import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordQuery; import org.eclipse.kapua.model.id.KapuaId; -import javax.inject.Singleton; - /** * {@link EventStoreFactory} implementation * @@ -45,11 +44,6 @@ public EventStoreRecordQuery newQuery(KapuaId scopeId) { return new EventStoreQueryImpl(scopeId); } - @Override - public EventStoreRecordListResult newListResult() { - return new EventStoreRecordListResultImpl(); - } - @Override public EventStoreRecord clone(EventStoreRecord eventStoreRecord) { try { diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordImplJpaRepository.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordImplJpaRepository.java index 10363ed304a..67b965941f6 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordImplJpaRepository.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordImplJpaRepository.java @@ -21,9 +21,9 @@ public class EventStoreRecordImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements EventStoreRecordRepository { + public EventStoreRecordImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(EventStoreRecordImpl.class, EventStoreRecord.TYPE, () -> new EventStoreRecordListResultImpl(), jpaRepoConfig); + super(EventStoreRecordImpl.class, EventStoreRecord.TYPE, () -> new EventStoreRecordListResult(), jpaRepoConfig); } - } diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordListResultImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordListResultImpl.java deleted file mode 100644 index 38ed77fbcc8..00000000000 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreRecordListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.commons.service.event.store.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecord; -import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordListResult; - -/** - * KapuaEvent list result implementation. - * - * @since 1.0 - */ -public class EventStoreRecordListResultImpl extends KapuaListResultImpl implements EventStoreRecordListResult { - - private static final long serialVersionUID = -5118004898345748297L; -} diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/EntityCache.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/EntityCache.java index f17db8d4930..481a90e69d7 100644 --- a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/EntityCache.java +++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/EntityCache.java @@ -12,6 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.commons.service.internal.cache; +import java.io.Serializable; + +import javax.cache.Cache; + import org.eclipse.kapua.commons.metric.CommonsMetric; import org.eclipse.kapua.model.KapuaEntity; import org.eclipse.kapua.model.id.KapuaId; @@ -19,12 +23,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.cache.Cache; -import java.io.Serializable; - /** - * The basic cache class, it contains two {@link Cache} objects. - * The {@code idCache} cache contains {@link KapuaEntity} objects, while the {@code listsCache} contains {@link KapuaListResult} objects. + * The basic cache class, it contains two {@link Cache} objects. The {@code idCache} cache contains {@link KapuaEntity} objects, while the {@code listsCache} contains {@link KapuaListResult} objects. */ public class EntityCache { @@ -134,11 +134,13 @@ public KapuaListResult removeList(KapuaId scopeId, Serializable id) { } /** - * Checks that the scopeId of the entity matches the provided one. - * This mimics the checks that are performed in the 'find' method of the {@link org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository} class. + * Checks that the scopeId of the entity matches the provided one. This mimics the checks that are performed in the 'find' method of the + * {@link org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository} class. * - * @param scopeId a {@link KapuaId} representing the scopeId - * @param entity the {@link KapuaEntity} to be checked + * @param scopeId + * a {@link KapuaId} representing the scopeId + * @param entity + * the {@link KapuaEntity} to be checked * @return the provided entity if it has the required scopeId, null otherwise */ protected KapuaEntity checkResult(KapuaId scopeId, KapuaEntity entity) { @@ -158,14 +160,16 @@ protected KapuaEntity checkResult(KapuaId scopeId, KapuaEntity entity) { } /** - * Checks that the scopeId of the entity matches the provided one. - * This mimics the checks that are performed in the 'find' method of the {@link org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository} class. + * Checks that the scopeId of the entity matches the provided one. This mimics the checks that are performed in the 'find' method of the + * {@link org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository} class. * - * @param scopeId a {@link KapuaId} representing the scopeId - * @param entity the {@link KapuaListResult} entity to be checked + * @param scopeId + * a {@link KapuaId} representing the scopeId + * @param entity + * the {@link KapuaListResult} entity to be checked * @return the provided entity if it has the required scopeId, null otherwise */ - protected KapuaListResult checkResult(KapuaId scopeId, KapuaListResult entity) { + protected KapuaListResult checkResult(KapuaId scopeId, KapuaListResult entity) { if (entity != null) { if (entity.getSize() == 0) { return entity; // If the list is empty, I want to return the empty list @@ -186,10 +190,14 @@ protected KapuaListResult checkResult(KapuaId scopeId, KapuaListResult entity) { /** * Handles logging for cache exceptions. * - * @param operation the name of the method/operation - * @param cacheName the name of the cache in which the operation is performed - * @param keyId the Id of the entry's key in the cache - * @param t the exception + * @param operation + * the name of the method/operation + * @param cacheName + * the name of the cache in which the operation is performed + * @param keyId + * the Id of the entry's key in the cache + * @param t + * the exception */ protected void cacheErrorLogger(String operation, String cacheName, Serializable keyId, Throwable t) { commonsMetric.getCacheError().inc(); diff --git a/commons/src/test/java/org/eclipse/kapua/commons/model/misc/CollisionEntityJpaRepository.java b/commons/src/test/java/org/eclipse/kapua/commons/model/misc/CollisionEntityJpaRepository.java index dacf2bbb7e1..e8d5726b35d 100644 --- a/commons/src/test/java/org/eclipse/kapua/commons/model/misc/CollisionEntityJpaRepository.java +++ b/commons/src/test/java/org/eclipse/kapua/commons/model/misc/CollisionEntityJpaRepository.java @@ -14,14 +14,12 @@ import org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; import org.eclipse.kapua.model.query.KapuaListResult; - public class CollisionEntityJpaRepository extends KapuaEntityJpaRepository> { public CollisionEntityJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(CollisionEntity.class, CollisionEntity.TYPE, () -> new KapuaListResultImpl<>(), configuration); + super(CollisionEntity.class, CollisionEntity.TYPE, () -> new KapuaListResult<>(), configuration); } } diff --git a/commons/src/test/java/org/eclipse/kapua/commons/model/query/KapuaListResultImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/model/query/KapuaListResultTest.java similarity index 85% rename from commons/src/test/java/org/eclipse/kapua/commons/model/query/KapuaListResultImplTest.java rename to commons/src/test/java/org/eclipse/kapua/commons/model/query/KapuaListResultTest.java index db57913c750..add84b7c7cc 100644 --- a/commons/src/test/java/org/eclipse/kapua/commons/model/query/KapuaListResultImplTest.java +++ b/commons/src/test/java/org/eclipse/kapua/commons/model/query/KapuaListResultTest.java @@ -12,31 +12,32 @@ *******************************************************************************/ package org.eclipse.kapua.commons.model.query; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Random; + import org.eclipse.kapua.commons.model.AbstractKapuaEntity; import org.eclipse.kapua.commons.model.id.KapuaEid; import org.eclipse.kapua.commons.util.RandomUtils; import org.eclipse.kapua.model.id.KapuaId; +import org.eclipse.kapua.model.query.KapuaListResult; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Random; - @Category(JUnitTests.class) -public class KapuaListResultImplTest { +public class KapuaListResultTest { private final static Random RANDOM = RandomUtils.getInstance(); @Test public void kapuaListResultImplTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); Assert.assertNotNull(kapuaListResult.getItems()); Assert.assertTrue(kapuaListResult.getItems().isEmpty()); @@ -53,7 +54,7 @@ public void addItemsTest() { items.add(kapuaEntity1); items.add(kapuaEntity2); - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); kapuaListResult.addItems(items); Assert.assertEquals(2, kapuaListResult.getItems().size()); @@ -67,7 +68,7 @@ public void addItemTest() { AbstractKapuaEntity kapuaEntity1 = Mockito.mock(AbstractKapuaEntity.class); AbstractKapuaEntity kapuaEntity2 = Mockito.mock(AbstractKapuaEntity.class); - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); kapuaListResult.addItem(kapuaEntity1); kapuaListResult.addItem(kapuaEntity2); @@ -79,7 +80,7 @@ public void addItemTest() { @Test public void clearItemsTest() { int testSize = 10; - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); for (int i = 0; i < testSize; i++) { kapuaListResult.addItem(Mockito.mock(AbstractKapuaEntity.class)); @@ -94,7 +95,7 @@ public void clearItemsTest() { @Test public void getFirstItemTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); AbstractKapuaEntity kapuaEntity1 = Mockito.mock(AbstractKapuaEntity.class); kapuaListResult.addItem(kapuaEntity1); @@ -108,7 +109,7 @@ public void getFirstItemTest() { @Test public void getItemsTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); AbstractKapuaEntity kapuaEntity1 = Mockito.mock(AbstractKapuaEntity.class); kapuaListResult.addItem(kapuaEntity1); @@ -124,7 +125,7 @@ public void getItemsTest() { @Test public void getItemsPredicateTest() { int testSize = 10; - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); for (int i = 0; i < testSize; i++) { AbstractKapuaEntity kapuaEntity = Mockito.mock(AbstractKapuaEntity.class); @@ -144,7 +145,7 @@ public void getItemsPredicateTest() { @Test public void getItemsAsMapKeyTest() { int testSize = 10; - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); for (int i = 0; i < testSize; i++) { AbstractKapuaEntity kapuaEntity = Mockito.mock(AbstractKapuaEntity.class); @@ -164,7 +165,7 @@ public void getItemsAsMapKeyTest() { @Test public void getItemsAsMapKeyValueTest() { int testSize = 10; - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); for (int i = 0; i < testSize; i++) { AbstractKapuaEntity kapuaEntity = Mockito.mock(AbstractKapuaEntity.class); @@ -184,7 +185,7 @@ public void getItemsAsMapKeyValueTest() { @Test public void getItemTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); AbstractKapuaEntity kapuaEntity1 = Mockito.mock(AbstractKapuaEntity.class); kapuaListResult.addItem(kapuaEntity1); @@ -199,7 +200,7 @@ public void getItemTest() { @Test public void getSizeTest() { int testSize = 10; - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); for (int i = 0; i < testSize; i++) { kapuaListResult.addItem(Mockito.mock(AbstractKapuaEntity.class)); @@ -210,7 +211,7 @@ public void getSizeTest() { @Test public void isEmptyTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); Assert.assertTrue(kapuaListResult.isEmpty()); kapuaListResult.addItem(Mockito.mock(AbstractKapuaEntity.class)); @@ -219,7 +220,7 @@ public void isEmptyTest() { @Test public void setGetLimitExceededTrueTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); kapuaListResult.setLimitExceeded(true); Assert.assertTrue(kapuaListResult.isLimitExceeded()); @@ -227,7 +228,7 @@ public void setGetLimitExceededTrueTest() { @Test public void setGetLimitExceededFalseTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); kapuaListResult.setLimitExceeded(false); Assert.assertFalse(kapuaListResult.isLimitExceeded()); @@ -235,14 +236,14 @@ public void setGetLimitExceededFalseTest() { @Test public void setGetTotalCountDefaultTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); Assert.assertNull(kapuaListResult.getTotalCount()); } @Test public void setGetTotalCountValueTest() { - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); kapuaListResult.setTotalCount(10L); Assert.assertEquals(new Long(10L), kapuaListResult.getTotalCount()); @@ -251,7 +252,7 @@ public void setGetTotalCountValueTest() { @Test public void sortComparatorTest() { int testSize = 10; - KapuaListResultImpl kapuaListResult = new KapuaListResultImpl<>(); + KapuaListResult kapuaListResult = new KapuaListResult<>(); // Add the max value AbstractKapuaEntity kapuaEntityMax = Mockito.mock(AbstractKapuaEntity.class); diff --git a/commons/src/test/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImplTest.java index 23379802a93..e112a27e521 100644 --- a/commons/src/test/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImplTest.java +++ b/commons/src/test/java/org/eclipse/kapua/commons/service/event/store/internal/EventStoreFactoryImplTest.java @@ -12,11 +12,12 @@ *******************************************************************************/ package org.eclipse.kapua.commons.service.event.store.internal; +import java.math.BigInteger; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.commons.model.id.KapuaEid; import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecord; import org.eclipse.kapua.model.id.KapuaId; - import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.hamcrest.core.IsInstanceOf; import org.junit.Assert; @@ -24,53 +25,42 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.math.BigInteger; - - @Category(JUnitTests.class) public class EventStoreFactoryImplTest { @Test public void newEntityTest() { EventStoreFactoryImpl eventStoreFactoryImpl = new EventStoreFactoryImpl(); - KapuaId[] scopeIdList = {null, new KapuaEid(BigInteger.ONE)}; + KapuaId[] scopeIdList = { null, new KapuaEid(BigInteger.ONE) }; for (KapuaId scopeId : scopeIdList) { Assert.assertNotNull("Null not expected.", eventStoreFactoryImpl.newEntity(scopeId)); - Assert.assertThat("EventStoreRecordImpl object expected.", eventStoreFactoryImpl.newEntity(scopeId), IsInstanceOf.instanceOf(EventStoreRecordImpl.class)); + Assert.assertThat("EventStoreRecordImpl object expected.", eventStoreFactoryImpl.newEntity(scopeId), IsInstanceOf.instanceOf(EventStoreRecordImpl.class)); } } @Test public void newCreatorTest() { EventStoreFactoryImpl eventStoreFactoryImpl = new EventStoreFactoryImpl(); - KapuaId[] scopeIdList = {null, new KapuaEid(BigInteger.ONE)}; + KapuaId[] scopeIdList = { null, new KapuaEid(BigInteger.ONE) }; for (KapuaId scopeId : scopeIdList) { Assert.assertNotNull("Null not expected.", eventStoreFactoryImpl.newCreator(scopeId)); - Assert.assertThat("EventStoreRecordImpl object expected.", eventStoreFactoryImpl.newCreator(scopeId), IsInstanceOf.instanceOf(EventStoreRecordCreatorImpl.class)); + Assert.assertThat("EventStoreRecordImpl object expected.", eventStoreFactoryImpl.newCreator(scopeId), IsInstanceOf.instanceOf(EventStoreRecordCreatorImpl.class)); } } @Test public void newQueryTest() { EventStoreFactoryImpl eventStoreFactoryImpl = new EventStoreFactoryImpl(); - KapuaId[] scopeIdList = {null, new KapuaEid(BigInteger.ONE)}; + KapuaId[] scopeIdList = { null, new KapuaEid(BigInteger.ONE) }; for (KapuaId scopeId : scopeIdList) { Assert.assertNotNull("Null not expected.", eventStoreFactoryImpl.newQuery(scopeId)); - Assert.assertThat("EventStoreQueryImpl object expected.", eventStoreFactoryImpl.newQuery(scopeId), IsInstanceOf.instanceOf(EventStoreQueryImpl.class)); + Assert.assertThat("EventStoreQueryImpl object expected.", eventStoreFactoryImpl.newQuery(scopeId), IsInstanceOf.instanceOf(EventStoreQueryImpl.class)); } } - @Test - public void newListResultTest() { - EventStoreFactoryImpl eventStoreFactoryImpl = new EventStoreFactoryImpl(); - - Assert.assertNotNull("Null not expected.", eventStoreFactoryImpl.newListResult()); - Assert.assertThat("EventStoreRecordListResultImpl object expected.", eventStoreFactoryImpl.newListResult(), IsInstanceOf.instanceOf(EventStoreRecordListResultImpl.class)); - } - @Test public void cloneTest() { EventStoreFactoryImpl eventStoreFactoryImpl = new EventStoreFactoryImpl(); diff --git a/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/shared/util/GwtKapuaDeviceModelConverter.java b/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/shared/util/GwtKapuaDeviceModelConverter.java index 4a70ef4d824..b9c310f807d 100644 --- a/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/shared/util/GwtKapuaDeviceModelConverter.java +++ b/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/shared/util/GwtKapuaDeviceModelConverter.java @@ -12,8 +12,9 @@ *******************************************************************************/ package org.eclipse.kapua.app.console.module.device.shared.util; -import com.extjs.gxt.ui.client.Style.SortDir; -import com.extjs.gxt.ui.client.data.PagingLoadConfig; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang3.StringUtils; import org.eclipse.kapua.app.console.module.api.shared.util.GwtKapuaCommonsModelConverter; import org.eclipse.kapua.app.console.module.device.shared.model.GwtDeviceQuery; @@ -51,8 +52,8 @@ import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionQuery; import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionStatus; -import java.util.ArrayList; -import java.util.List; +import com.extjs.gxt.ui.client.Style.SortDir; +import com.extjs.gxt.ui.client.data.PagingLoadConfig; public class GwtKapuaDeviceModelConverter { @@ -64,7 +65,6 @@ public class GwtKapuaDeviceModelConverter { private static final DeviceAssetFactory ASSET_FACTORY = LOCATOR.getFactory(DeviceAssetFactory.class); - private GwtKapuaDeviceModelConverter() { } @@ -89,11 +89,11 @@ public static DeviceConnectionQuery convertConnectionQuery(PagingLoadConfig load } if (gwtDeviceConnectionQuery.getGwtDeviceConnectionReservedUser() != null) { switch (gwtDeviceConnectionQuery.getGwtDeviceConnectionReservedUser()) { - case NONE: - predicate = predicate.and(query.attributePredicate(DeviceConnectionAttributes.RESERVED_USER_ID, null, Operator.IS_NULL)); - break; - default: - predicate = predicate.and(query.attributePredicate(DeviceConnectionAttributes.RESERVED_USER_ID, KapuaEid.parseCompactId(gwtDeviceConnectionQuery.getReservedUserId()))); + case NONE: + predicate = predicate.and(query.attributePredicate(DeviceConnectionAttributes.RESERVED_USER_ID, null, Operator.IS_NULL)); + break; + default: + predicate = predicate.and(query.attributePredicate(DeviceConnectionAttributes.RESERVED_USER_ID, KapuaEid.parseCompactId(gwtDeviceConnectionQuery.getReservedUserId()))); } } @@ -122,7 +122,7 @@ public static DeviceConnectionStatus convertConnectionStatus(String connectionSt } public static DeviceAssets convertDeviceAssets(GwtDeviceAssets deviceAssets) { - DeviceAssets assets = ASSET_FACTORY.newAssetListResult(); + DeviceAssets assets = new DeviceAssets(); List assetList = new ArrayList(); for (GwtDeviceAsset gwtDeviceAsset : deviceAssets.getAssets()) { assetList.add(convertDeviceAsset(gwtDeviceAsset)); @@ -199,22 +199,22 @@ public static DeviceQuery convertDeviceQuery(PagingLoadConfig loadConfig, GwtDev } if (predicates.getDeviceConnectionStatus() != null) { switch (predicates.getDeviceConnectionStatusEnum()) { - case UNKNOWN: - andPred = andPred.and(query.attributePredicate(DeviceAttributes.CONNECTION_ID, DeviceConnectionStatus.NULL, Operator.IS_NULL)); - break; - default: - andPred = andPred.and(query.attributePredicate(DeviceAttributes.CONNECTION_STATUS, DeviceConnectionStatus.valueOf(predicates.getDeviceConnectionStatus()))); + case UNKNOWN: + andPred = andPred.and(query.attributePredicate(DeviceAttributes.CONNECTION_ID, DeviceConnectionStatus.NULL, Operator.IS_NULL)); + break; + default: + andPred = andPred.and(query.attributePredicate(DeviceAttributes.CONNECTION_STATUS, DeviceConnectionStatus.valueOf(predicates.getDeviceConnectionStatus()))); } } if (predicates.getGroupDevice() != null) { switch (predicates.getGroupDeviceEnum()) { - case NO_GROUP: - andPred = andPred.and(query.attributePredicate(DeviceAttributes.GROUP_ID, null, Operator.IS_NULL)); - break; - default: - if (predicates.getGroupId() != null) { - andPred = andPred.and(query.attributePredicate(DeviceAttributes.GROUP_ID, KapuaEid.parseCompactId(predicates.getGroupId()))); - } + case NO_GROUP: + andPred = andPred.and(query.attributePredicate(DeviceAttributes.GROUP_ID, null, Operator.IS_NULL)); + break; + default: + if (predicates.getGroupId() != null) { + andPred = andPred.and(query.attributePredicate(DeviceAttributes.GROUP_ID, KapuaEid.parseCompactId(predicates.getGroupId()))); + } } } if (predicates.getTagIds() != null) { @@ -241,7 +241,6 @@ public static DeviceQuery convertDeviceQuery(PagingLoadConfig loadConfig, GwtDev return query; } - public static DeviceManagementOperationQuery convertDeviceManagementOperationQuery(PagingLoadConfig loadConfig, GwtDeviceManagementOperationQuery gwtQuery) { DeviceManagementOperationQuery query = DEVICE_MANAGEMENT_OPERATION_FACTORY.newQuery(KapuaEid.parseCompactId(gwtQuery.getScopeId())); diff --git a/console/module/job/src/main/java/org/eclipse/kapua/app/console/module/job/servlet/JobTargetExporterServlet.java b/console/module/job/src/main/java/org/eclipse/kapua/app/console/module/job/servlet/JobTargetExporterServlet.java index 3826c67c117..763c0070c58 100644 --- a/console/module/job/src/main/java/org/eclipse/kapua/app/console/module/job/servlet/JobTargetExporterServlet.java +++ b/console/module/job/src/main/java/org/eclipse/kapua/app/console/module/job/servlet/JobTargetExporterServlet.java @@ -12,6 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.app.console.module.job.servlet; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.eclipse.kapua.KapuaEntityNotFoundException; import org.eclipse.kapua.KapuaIllegalAccessException; import org.eclipse.kapua.KapuaUnauthenticatedException; @@ -21,17 +28,12 @@ import org.eclipse.kapua.service.job.targets.JobTarget; import org.eclipse.kapua.service.job.targets.JobTargetAttributes; import org.eclipse.kapua.service.job.targets.JobTargetFactory; +import org.eclipse.kapua.service.job.targets.JobTargetListResult; import org.eclipse.kapua.service.job.targets.JobTargetQuery; import org.eclipse.kapua.service.job.targets.JobTargetService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - public class JobTargetExporterServlet extends HttpServlet { private static final long serialVersionUID = -2533869595709953567L; @@ -87,7 +89,7 @@ private void internalDoGet(HttpServletRequest request, HttpServletResponse respo // paginate through the matching message jobTargetQuery.setLimit(250); - KapuaListResult totalJobTargets = jobTargetFactory.newListResult(); + KapuaListResult totalJobTargets = new JobTargetListResult(); KapuaListResult results; do { jobTargetQuery.setOffset(offset); diff --git a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorJpaRepository.java b/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorJpaRepository.java index aebb923387d..d97364cfe39 100644 --- a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorJpaRepository.java +++ b/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.extras.migrator.encryption.authentication; +import java.util.Optional; + import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaUpdatableEntityJpaRepository; import org.eclipse.kapua.model.id.KapuaId; @@ -20,13 +22,12 @@ import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionRepository; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class MfaOptionMigratorJpaRepository extends KapuaUpdatableEntityJpaRepository implements MfaOptionRepository { + public MfaOptionMigratorJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(MfaOptionMigrator.class, MfaOption.TYPE, () -> new MfaOptionMigratorListResultImpl(), jpaRepoConfig); + super(MfaOptionMigrator.class, MfaOption.TYPE, () -> new MfaOptionListResult(), jpaRepoConfig); } @Override diff --git a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorListResultImpl.java b/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorListResultImpl.java deleted file mode 100644 index fcade9feb5e..00000000000 --- a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/authentication/MfaOptionMigratorListResultImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.extras.migrator.encryption.authentication; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authentication.credential.mfa.MfaOption; -import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionListResult; - -/** - * {@link MfaOptionListResult} implementation. - * - * @since 1.0.0 - */ -public class MfaOptionMigratorListResultImpl extends KapuaListResultImpl implements MfaOptionListResult { -} diff --git a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorJpaRepository.java b/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorJpaRepository.java index 252b5bcf617..62e73c3956f 100644 --- a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorJpaRepository.java +++ b/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.extras.migrator.encryption.job; +import java.util.Optional; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaNamedEntityJpaRepository; @@ -22,14 +24,12 @@ import org.eclipse.kapua.service.job.step.definition.JobStepProperty; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class JobStepMigratorJpaRepository extends KapuaNamedEntityJpaRepository implements JobStepRepository { public JobStepMigratorJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobStepMigrator.class, JobStep.TYPE, () -> new JobStepMigratorListResultImpl(), jpaRepoConfig); + super(JobStepMigrator.class, JobStep.TYPE, () -> new JobStepListResult(), jpaRepoConfig); } @Override diff --git a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorListResultImpl.java b/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorListResultImpl.java deleted file mode 100644 index 7662b098c99..00000000000 --- a/extras/encryption-migrator/src/main/java/org/eclipse/kapua/extras/migrator/encryption/job/JobStepMigratorListResultImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.extras.migrator.encryption.job; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.job.step.JobStep; -import org.eclipse.kapua.service.job.step.JobStepListResult; - -/** - * {@link JobStepListResult} implementation. - * - * @since 1.0.0 - */ -public class JobStepMigratorListResultImpl extends KapuaListResultImpl implements JobStepListResult { -} diff --git a/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionFactory.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionFactory.java index 788da3a3d2f..88305e0d0a6 100644 --- a/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionFactory.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionFactory.java @@ -19,6 +19,6 @@ * * @since 1.1.0 */ -public interface QueuedJobExecutionFactory extends KapuaEntityFactory { +public interface QueuedJobExecutionFactory extends KapuaEntityFactory { } diff --git a/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionListResult.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionListResult.java index d3c35da8534..906559a3a38 100644 --- a/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionListResult.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionListResult.java @@ -26,7 +26,7 @@ */ @XmlRootElement(name = "queuedJobListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = QueuedJobExecutionXmlRegistry.class, factoryMethod = "newQueuedJobExecutionListResult") -public interface QueuedJobExecutionListResult extends KapuaListResult { +@XmlType +public class QueuedJobExecutionListResult extends KapuaListResult { } diff --git a/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionXmlRegistry.java b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionXmlRegistry.java index 3f5554b0966..e8a33d71999 100644 --- a/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionXmlRegistry.java +++ b/job-engine/api/src/main/java/org/eclipse/kapua/job/engine/queue/QueuedJobExecutionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.job.engine.queue; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link QueuedJobExecution} xml factory class * @@ -44,15 +44,6 @@ public QueuedJobExecutionCreator newQueuedJobExecutionCreator() { return queuedJobExecutionFactory.newCreator(null); } - /** - * Creates a new job list result instance - * - * @return - */ - public QueuedJobExecutionListResult newQueuedJobExecutionListResult() { - return queuedJobExecutionFactory.newListResult(); - } - public QueuedJobExecutionQuery newQuery() { return queuedJobExecutionFactory.newQuery(null); } diff --git a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionFactoryImpl.java b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionFactoryImpl.java index fd5c6642390..6a9029ac52b 100644 --- a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionFactoryImpl.java +++ b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.job.engine.queue.jbatch; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.job.engine.queue.QueuedJobExecution; import org.eclipse.kapua.job.engine.queue.QueuedJobExecutionCreator; import org.eclipse.kapua.job.engine.queue.QueuedJobExecutionFactory; -import org.eclipse.kapua.job.engine.queue.QueuedJobExecutionListResult; import org.eclipse.kapua.job.engine.queue.QueuedJobExecutionQuery; import org.eclipse.kapua.model.id.KapuaId; -import javax.inject.Singleton; - /** * {@link QueuedJobExecutionFactory} implementation. * @@ -45,11 +44,6 @@ public QueuedJobExecutionQuery newQuery(KapuaId scopeId) { return new QueuedJobExecutionQueryImpl(scopeId); } - @Override - public QueuedJobExecutionListResult newListResult() { - return new QueuedJobExecutionListResultImpl(); - } - @Override public QueuedJobExecution clone(QueuedJobExecution queuedJobExecution) { try { diff --git a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionImplJpaRepository.java b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionImplJpaRepository.java index a5956470dbf..d4b98e6d520 100644 --- a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionImplJpaRepository.java +++ b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionImplJpaRepository.java @@ -22,7 +22,8 @@ public class QueuedJobExecutionImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements QueuedJobExecutionRepository { + public QueuedJobExecutionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(QueuedJobExecutionImpl.class, JobExecution.TYPE, () -> new QueuedJobExecutionListResultImpl(), jpaRepoConfig); + super(QueuedJobExecutionImpl.class, JobExecution.TYPE, () -> new QueuedJobExecutionListResult(), jpaRepoConfig); } } diff --git a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionListResultImpl.java b/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionListResultImpl.java deleted file mode 100644 index d7a642d35d0..00000000000 --- a/job-engine/jbatch/src/main/java/org/eclipse/kapua/job/engine/queue/jbatch/QueuedJobExecutionListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.job.engine.queue.jbatch; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.job.engine.queue.QueuedJobExecution; -import org.eclipse.kapua.job.engine.queue.QueuedJobExecutionListResult; - -/** - * {@link QueuedJobExecutionListResult} implementation. - * - * @since 1.1.0 - */ -public class QueuedJobExecutionListResultImpl extends KapuaListResultImpl implements QueuedJobExecutionListResult { - -} diff --git a/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/RolePermissionFactoryTest.java b/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/RolePermissionFactoryTest.java index 0c5d9152e5c..6de74c1e466 100644 --- a/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/RolePermissionFactoryTest.java +++ b/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/RolePermissionFactoryTest.java @@ -12,12 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.integration.misc; +import java.util.Date; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.permission.shiro.PermissionImpl; import org.eclipse.kapua.service.authorization.role.RolePermission; import org.eclipse.kapua.service.authorization.role.RolePermissionCreator; -import org.eclipse.kapua.service.authorization.role.RolePermissionListResult; import org.eclipse.kapua.service.authorization.role.RolePermissionQuery; import org.eclipse.kapua.service.authorization.role.shiro.RolePermissionFactoryImpl; import org.junit.Assert; @@ -26,9 +27,6 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class RolePermissionFactoryTest { @@ -91,12 +89,6 @@ public void newQueryNullTest() { Assert.assertNull("Null expected.", rolePermissionFactoryImpl.newQuery(null).getScopeId()); } - @Test - public void newListResultTest() { - Assert.assertTrue("True expected.", rolePermissionFactoryImpl.newListResult() instanceof RolePermissionListResult); - Assert.assertTrue("True expected.", rolePermissionFactoryImpl.newListResult().isEmpty()); - } - @Test public void cloneTest() { RolePermission resultRolePermission = rolePermissionFactoryImpl.clone(rolePermission); diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java index a3e12cc6f7d..ea256b9ced7 100644 --- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java +++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java @@ -12,6 +12,18 @@ *******************************************************************************/ package org.eclipse.kapua.app.api.resources.v1.resources; +import javax.inject.Inject; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.app.api.core.model.EntityId; import org.eclipse.kapua.app.api.core.model.ScopeId; @@ -25,18 +37,6 @@ import org.eclipse.kapua.service.device.management.asset.store.settings.DeviceAssetStoreSettings; import org.eclipse.kapua.service.device.registry.Device; -import javax.inject.Inject; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - @Path("{scopeId}/devices/{deviceId}/assets") public class DeviceManagementAssets extends AbstractKapuaResource { @@ -50,34 +50,42 @@ public class DeviceManagementAssets extends AbstractKapuaResource { /** * Returns the list of all the Assets configured on the device. * - * @param scopeId The {@link ScopeId} of the {@link Device}. - * @param deviceId The id of the device - * @param timeout The timeout of the operation in milliseconds + * @param scopeId + * The {@link ScopeId} of the {@link Device}. + * @param deviceId + * The id of the device + * @param timeout + * The timeout of the operation in milliseconds * @return The list of Assets - * @throws KapuaException Whenever something bad happens. See specific {@link KapuaService} exceptions. + * @throws KapuaException + * Whenever something bad happens. See specific {@link KapuaService} exceptions. * @since 1.0.0 */ @GET - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public DeviceAssets get( @PathParam("scopeId") ScopeId scopeId, @PathParam("deviceId") EntityId deviceId, @QueryParam("timeout") @DefaultValue("30000") Long timeout) throws KapuaException { - return get(scopeId, deviceId, timeout, deviceAssetFilter.newAssetListResult()); + return get(scopeId, deviceId, timeout, new DeviceAssets()); } /** * Returns the list of all the Assets configured on the device filtered by the {@link DeviceAssets} parameter. * - * @param scopeId The {@link ScopeId} of the {@link Device}. - * @param deviceId The id of the device - * @param timeout The timeout of the operation in milliseconds + * @param scopeId + * The {@link ScopeId} of the {@link Device}. + * @param deviceId + * The id of the device + * @param timeout + * The timeout of the operation in milliseconds * @return The list of Assets - * @throws KapuaException Whenever something bad happens. See specific {@link KapuaService} exceptions. + * @throws KapuaException + * Whenever something bad happens. See specific {@link KapuaService} exceptions. * @since 1.0.0 */ @POST - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public DeviceAssets get( @PathParam("scopeId") ScopeId scopeId, @PathParam("deviceId") EntityId deviceId, @@ -89,16 +97,20 @@ public DeviceAssets get( /** * Reads {@link DeviceAssetChannel}s values available on the device filtered by the {@link DeviceAssets} parameter. * - * @param scopeId The {@link ScopeId} of the {@link Device}. - * @param deviceId The id of the device - * @param timeout The timeout of the operation in milliseconds + * @param scopeId + * The {@link ScopeId} of the {@link Device}. + * @param deviceId + * The id of the device + * @param timeout + * The timeout of the operation in milliseconds * @return The list of Assets - * @throws KapuaException Whenever something bad happens. See specific {@link KapuaService} exceptions. + * @throws KapuaException + * Whenever something bad happens. See specific {@link KapuaService} exceptions. * @since 1.0.0 */ @POST @Path("_read") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public DeviceAssets read( @PathParam("scopeId") ScopeId scopeId, @PathParam("deviceId") EntityId deviceId, @@ -110,16 +122,20 @@ public DeviceAssets read( /** * Writes {@link DeviceAssetChannel}s configured on the device filtered by the {@link DeviceAssets} parameter. * - * @param scopeId The {@link ScopeId} of the {@link Device}. - * @param deviceId The id of the device - * @param timeout The timeout of the operation in milliseconds + * @param scopeId + * The {@link ScopeId} of the {@link Device}. + * @param deviceId + * The id of the device + * @param timeout + * The timeout of the operation in milliseconds * @return The list of Assets - * @throws KapuaException Whenever something bad happens. See specific {@link KapuaService} exceptions. + * @throws KapuaException + * Whenever something bad happens. See specific {@link KapuaService} exceptions. * @since 1.0.0 */ @POST @Path("_write") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public DeviceAssets write( @PathParam("scopeId") ScopeId scopeId, @PathParam("deviceId") EntityId deviceId, @@ -130,7 +146,7 @@ public DeviceAssets write( @GET @Path("_settings") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public DeviceAssetStoreSettings getSettings( @PathParam("scopeId") ScopeId scopeId, @PathParam("deviceId") EntityId deviceId) @@ -140,7 +156,7 @@ public DeviceAssetStoreSettings getSettings( @PUT @Path("_settings") - @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) public Response postSettings( @PathParam("scopeId") ScopeId scopeId, @PathParam("deviceId") EntityId deviceId, diff --git a/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountFactory.java b/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountFactory.java index 81ee1ba3ba5..9e2a0d806ad 100644 --- a/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountFactory.java +++ b/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountFactory.java @@ -21,13 +21,15 @@ * @see KapuaEntityFactory * @since 1.0.0 */ -public interface AccountFactory extends KapuaEntityFactory { +public interface AccountFactory extends KapuaEntityFactory { /** * Instantiates a new {@link AccountCreator} with the given name. * - * @param scopeId The scope {@link KapuaId} to set in the {@link AccountCreator} - * @param name The name to set in the {@link AccountCreator} + * @param scopeId + * The scope {@link KapuaId} to set in the {@link AccountCreator} + * @param name + * The name to set in the {@link AccountCreator} * @return The newly instantiated {@link AccountCreator} * @since 1.0.0 * @deprecated Since 1.6.0. Please make use of {@link #newCreator(KapuaId)} and then use {@link AccountCreator#setName(String)}. diff --git a/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountListResult.java b/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountListResult.java index 2a722a816d7..e6802552b7c 100644 --- a/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountListResult.java +++ b/service/account/api/src/main/java/org/eclipse/kapua/service/account/AccountListResult.java @@ -12,14 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.account; -import org.eclipse.kapua.model.query.KapuaListResult; -import org.eclipse.kapua.service.account.xml.AccountXmlRegistry; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link Account} {@link KapuaListResult} definition. * @@ -28,7 +27,9 @@ */ @XmlRootElement(name = "accountListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = AccountXmlRegistry.class, factoryMethod = "newAccountListResult") -public interface AccountListResult extends KapuaListResult { +@XmlType +public class AccountListResult extends KapuaListResult { + + private static final long serialVersionUID = -5118004898345748297L; } diff --git a/service/account/api/src/main/java/org/eclipse/kapua/service/account/xml/AccountXmlRegistry.java b/service/account/api/src/main/java/org/eclipse/kapua/service/account/xml/AccountXmlRegistry.java index c18879dfbeb..08ea6672fee 100644 --- a/service/account/api/src/main/java/org/eclipse/kapua/service/account/xml/AccountXmlRegistry.java +++ b/service/account/api/src/main/java/org/eclipse/kapua/service/account/xml/AccountXmlRegistry.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.account.xml; +import javax.xml.bind.annotation.XmlRegistry; + import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.service.account.Account; import org.eclipse.kapua.service.account.AccountCreator; import org.eclipse.kapua.service.account.AccountFactory; -import org.eclipse.kapua.service.account.AccountListResult; import org.eclipse.kapua.service.account.AccountQuery; import org.eclipse.kapua.service.account.Organization; -import javax.xml.bind.annotation.XmlRegistry; - /** * {@link Account} xml factory class * @@ -53,16 +52,6 @@ public AccountCreator newAccountCreator() { return factory.newCreator(null); } - /** - * Instantiates a new {@link AccountListResult}. - * - * @return The newly instantiated {@link AccountListResult}. - * @since 1.0.0 - */ - public AccountListResult newAccountListResult() { - return factory.newListResult(); - } - /** * Instantiates a new {@link AccountQuery}. * diff --git a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountFactoryImpl.java b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountFactoryImpl.java index 947da2ca339..39a2399496f 100644 --- a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountFactoryImpl.java +++ b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountFactoryImpl.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.account.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.account.Account; import org.eclipse.kapua.service.account.AccountCreator; import org.eclipse.kapua.service.account.AccountFactory; -import org.eclipse.kapua.service.account.AccountListResult; import org.eclipse.kapua.service.account.AccountQuery; import org.eclipse.kapua.service.account.Organization; -import javax.inject.Singleton; - /** * {@link AccountFactory} implementation. * @@ -58,11 +57,6 @@ public AccountQuery newQuery(KapuaId scopeId) { return new AccountQueryImpl(scopeId); } - @Override - public AccountListResult newListResult() { - return new AccountListResultImpl(); - } - @Override public Account clone(Account account) { try { diff --git a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountImplJpaRepository.java b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountImplJpaRepository.java index 123d2691720..40eaad6d959 100644 --- a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountImplJpaRepository.java +++ b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountImplJpaRepository.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.kapua.service.account.internal; +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + import org.eclipse.kapua.commons.jpa.JpaAwareTxContext; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaNamedEntityJpaRepository; @@ -20,15 +23,12 @@ import org.eclipse.kapua.service.account.AccountRepository; import org.eclipse.kapua.storage.TxContext; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; - public class AccountImplJpaRepository extends KapuaNamedEntityJpaRepository implements AccountRepository { public AccountImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(AccountImpl.class, Account.TYPE, () -> new AccountListResultImpl(), jpaRepoConfig); + super(AccountImpl.class, Account.TYPE, () -> new AccountListResult(), jpaRepoConfig); } @Override diff --git a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountListResultImpl.java b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountListResultImpl.java deleted file mode 100644 index 34d05856e03..00000000000 --- a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.account.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.account.Account; -import org.eclipse.kapua.service.account.AccountListResult; - -/** - * {@link AccountListResult} implementation. - * - * @since 1.0.0 - */ -public class AccountListResultImpl extends KapuaListResultImpl implements AccountListResult { - - private static final long serialVersionUID = -5118004898345748297L; -} diff --git a/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityFactory.java b/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityFactory.java index 9ff2033129b..3bbc106a6f6 100644 --- a/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityFactory.java +++ b/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityFactory.java @@ -20,18 +20,23 @@ /** * {@link KapuaEntityFactory} definition. * - * @param The {@link KapuaEntity} for which this {@link KapuaEntityFactory} is for. - * @param The {@link KapuaEntityCreator} for which this {@link KapuaEntityFactory} is for. - * @param The {@link KapuaQuery} for which this {@link KapuaEntityFactory} is for. - * @param The {@link KapuaListResult} for which this {@link KapuaEntityFactory} is for. + * @param + * The {@link KapuaEntity} for which this {@link KapuaEntityFactory} is for. + * @param + * The {@link KapuaEntityCreator} for which this {@link KapuaEntityFactory} is for. + * @param + * The {@link KapuaQuery} for which this {@link KapuaEntityFactory} is for. + * @param + * The {@link KapuaListResult} for which this {@link KapuaEntityFactory} is for. * @since 1.0.0 */ -public interface KapuaEntityFactory, Q extends KapuaQuery, L extends KapuaListResult> extends KapuaObjectFactory { +public interface KapuaEntityFactory, Q extends KapuaQuery> extends KapuaObjectFactory { /** * Instantiates a new {@link KapuaEntity}. * - * @param scopeId The scope {@link KapuaId} to be set in the {@link KapuaEntity} + * @param scopeId + * The scope {@link KapuaId} to be set in the {@link KapuaEntity} * @return The newly instantiated {@link KapuaEntity} * @since 1.0.0 */ @@ -40,7 +45,8 @@ public interface KapuaEntityFactory {@link KapuaEntity} type. + * @param + * {@link KapuaEntity} type. * @since 1.0.0 */ @XmlRootElement(name = "result") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(propOrder = {"limitExceeded", "size", "items", "totalCount"}) -public interface KapuaListResult extends KapuaSerializable { +@XmlType(propOrder = { "limitExceeded", "size", "items", "totalCount" }) +public class KapuaListResult implements KapuaSerializable { + + private static final long serialVersionUID = 8939666089540269261L; + + private ArrayList items; + private boolean limitExceeded; + private Long totalCount; + + /** + * Constructor. + * + * @since 1.0.0 + */ + public KapuaListResult() { + limitExceeded = false; + } /** * Gets the limit exceeded flag. *

    - * This flag is {@code true} if there are more results that exceded the {@link KapuaQuery#getLimit()}. - * Increasing the {@link KapuaQuery#getLimit()} or moving the {@link KapuaQuery#getOffset()} will return more results + * This flag is {@code true} if there are more results that exceded the {@link KapuaQuery#getLimit()}. Increasing the {@link KapuaQuery#getLimit()} or moving the {@link KapuaQuery#getOffset()} + * will return more results * * @return The limit exceeded flag * @since 1.0.0 */ @XmlElement(name = "limitExceeded") - boolean isLimitExceeded(); + public boolean isLimitExceeded() { + return limitExceeded; + } /** * Sets the limit exceeded flag. *

    * To be set to {@code true} if the {@link KapuaQuery} matching elements are more than {@link KapuaQuery#getLimit()}. * - * @param limitExceeded The limit exceeded flag. + * @param limitExceeded + * The limit exceeded flag. * @since 1.0.0 */ - void setLimitExceeded(boolean limitExceeded); + public void setLimitExceeded(boolean limitExceeded) { + this.limitExceeded = limitExceeded; + } /** * Gets the {@link KapuaEntity}s that matched the {@link KapuaQuery#getPredicate()}. @@ -72,55 +95,77 @@ public interface KapuaListResult extends KapuaSerializabl */ @XmlElementWrapper(name = "items") @XmlElement(name = "item") - List getItems(); + public List getItems() { + if (items == null) { + items = new ArrayList<>(); + } + + return items; + } /** * Gets the {@link KapuaEntity}s that matched the {@link KapuaQuery#getPredicate()} and applies even more filtering. *

    * This is meant to be used to filter result when is not possible to do so with {@link KapuaQuery#getPredicate()}s. * - * @param filter The filter to apply to select results. + * @param filter + * The filter to apply to select results. * @return The filtered {@link KapuaEntity}s that matched the {@link KapuaQuery#getPredicate()}. * @since 2.0.0 */ - List getItems(@NotNull Predicate filter); + public List getItems(Predicate filter) { + return getItems().stream().filter(filter).collect(Collectors.toList()); + } /** - * Gets a {@link Map} whose {@link Map#keySet()} are generated from the given {@link Map.Entry#getKey()} mapper {@link Function}. - * The {@link Map#values()} are the {@link KapuaEntity}s themself. + * Gets a {@link Map} whose {@link Map#keySet()} are generated from the given {@link Map.Entry#getKey()} mapper {@link Function}. The {@link Map#values()} are the {@link KapuaEntity}s themself. *

    * This is like invoking {@link #getItemsAsMap(Function, Function)} whose value mapper returns the {@link KapuaEntity} itself. * - * @param keyMapper The {@link Function} which defines the {@link Map.Entry#getKey()} for each {@link Map.Entry} - * @param The type of the {@link Map.Entry#getKey()} + * @param keyMapper + * The {@link Function} which defines the {@link Map.Entry#getKey()} for each {@link Map.Entry} + * @param + * The type of the {@link Map.Entry#getKey()} * @return The {@link Map} generated according to the mapping {@link Map.Entry#getKey()} {@link Function}. * @since 2.0.0 */ - Map getItemsAsMap(@NotNull Function keyMapper); + public Map getItemsAsMap(Function keyMapper) { + return getItems().stream().collect(Collectors.toMap(keyMapper, e -> e)); + } /** - * Gets a {@link Map} whose {@link Map#keySet()} are generated from the given {@link Map.Entry#getKey()} mapper {@link Function}. - * The {@link Map#values()} are generated from the given {@link Map.Entry#getValue()} mapper {@link Function}. + * Gets a {@link Map} whose {@link Map#keySet()} are generated from the given {@link Map.Entry#getKey()} mapper {@link Function}. The {@link Map#values()} are generated from the given + * {@link Map.Entry#getValue()} mapper {@link Function}. * - * @param keyMapper The {@link Function} which defines the {@link Map.Entry#getKey()} for each {@link Map.Entry} - * @param valueMapper The {@link Function} which defines the {@link Map.Entry#getValue()} for each {@link Map.Entry} - * @param The type of the {@link Map.Entry#getKey()} - * @param The type of the {@link Map.Entry#getValue()} + * @param keyMapper + * The {@link Function} which defines the {@link Map.Entry#getKey()} for each {@link Map.Entry} + * @param valueMapper + * The {@link Function} which defines the {@link Map.Entry#getValue()} for each {@link Map.Entry} + * @param + * The type of the {@link Map.Entry#getKey()} + * @param + * The type of the {@link Map.Entry#getValue()} * @return The {@link Map} generated according to the mapping {@link Function}s. * @since 2.0.0 */ - Map getItemsAsMap(@NotNull Function keyMapper, @NotNull Function valueMapper); + public Map getItemsAsMap(Function keyMapper, Function valueMapper) { + return getItems().stream().collect(Collectors.toMap(keyMapper, valueMapper)); + } /** * Gets the {@link KapuaEntity} at the given position in the {@link KapuaListResult}. * - * @param i The position in the {@link KapuaListResult} + * @param index + * The position in the {@link KapuaListResult} * @return The {@link KapuaEntity} at the position - * @throws IndexOutOfBoundsException If position is not available. + * @throws IndexOutOfBoundsException + * If position is not available. * @see List#get(int) * @since 1.0.0 */ - E getItem(int i); + public E getItem(int index) { + return getItems().get(index); + } /** * Gets the first {@link KapuaEntity} in the {@link KapuaListResult}. @@ -130,7 +175,9 @@ public interface KapuaListResult extends KapuaSerializabl * @return The first element in the {@link KapuaListResult} or {@code null} if not present. * @since 1.0.0 */ - E getFirstItem(); + public E getFirstItem() { + return this.isEmpty() ? null : getItem(0); + } /** * Gets the result {@link KapuaListResult} size @@ -140,7 +187,9 @@ public interface KapuaListResult extends KapuaSerializabl * @since 1.0.0 */ @XmlElement(name = "size") - int getSize(); + public int getSize() { + return getItems().size(); + } /** * Checks if the result {@link KapuaListResult} is empty @@ -149,23 +198,31 @@ public interface KapuaListResult extends KapuaSerializabl * @see List#isEmpty() * @since 1.0.0 */ - boolean isEmpty(); + public boolean isEmpty() { + return getItems().isEmpty(); + } /** * Adds {@link KapuaEntity}s to the result {@link KapuaListResult} * - * @param items The {@link KapuaEntity}s to add. + * @param items + * The {@link KapuaEntity}s to add. * @see List#addAll(Collection) * @since 1.0.0 */ - void addItems(@NotNull Collection items); + public void addItems(Collection items) { + getItems().addAll(items); + } /** * Adds a {@link KapuaEntity} to the {@link KapuaListResult}. * - * @param item The {@link KapuaEntity} to add. + * @param item + * The {@link KapuaEntity} to add. */ - void addItem(@NotNull E item); + public void addItem(E item) { + getItems().add(item); + } /** * Clears {@link KapuaEntity} result {@link KapuaListResult} @@ -173,17 +230,22 @@ public interface KapuaListResult extends KapuaSerializabl * @see List#clear() * @since 1.0.0 */ - void clearItems(); + public void clearItems() { + getItems().clear(); + } /** * Sorts the result {@link List} according to the given {@link Comparator}. * - * @param comparator The {@link Comparator} used to compare items. + * @param comparator + * The {@link Comparator} used to compare items. * @see List#sort(Comparator) * @see Comparator * @since 1.0.0 */ - void sort(@NotNull Comparator comparator); + public void sort(Comparator comparator) { + getItems().sort(comparator); + } /** * Gets the total count of entries that match the {@link KapuaQuery#getPredicate()}s regardless of {@link KapuaQuery#getLimit()} and {@link KapuaQuery#getOffset()} @@ -191,12 +253,16 @@ public interface KapuaListResult extends KapuaSerializabl * @return The total count * @since 1.2.0 */ - Long getTotalCount(); + public Long getTotalCount() { + return totalCount; + } /** * Sets the total count of entries that match the {@link KapuaQuery#getPredicate()}s regardless of {@link KapuaQuery#getLimit()} and {@link KapuaQuery#getOffset()}. * * @since 1.2.0 */ - void setTotalCount(Long totalCount); + public void setTotalCount(Long totalCount) { + this.totalCount = totalCount; + } } diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/ChannelInfoListResultImpl.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/ChannelInfoListResultImpl.java index 30ed498d629..94786a11658 100644 --- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/ChannelInfoListResultImpl.java +++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/model/ChannelInfoListResultImpl.java @@ -14,7 +14,6 @@ import org.eclipse.kapua.service.datastore.model.ChannelInfo; import org.eclipse.kapua.service.datastore.model.ChannelInfoListResult; -import org.eclipse.kapua.service.elasticsearch.client.model.ResultList; import org.eclipse.kapua.service.storable.model.AbstractStorableListResult; /** @@ -24,25 +23,4 @@ */ public class ChannelInfoListResultImpl extends AbstractStorableListResult implements ChannelInfoListResult { - private static final long serialVersionUID = 1L; - - /** - * Constructor. - * - * @since 1.0.0 - */ - public ChannelInfoListResultImpl() { - super(); - } - - /** - * Constructor. - * - * @param resultList The {@link ResultList} to add. - * @since 1.0.0 - */ - public ChannelInfoListResultImpl(ResultList resultList) { - super(resultList.getResult(), resultList.getTotalCount()); - } - } diff --git a/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetFactory.java b/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetFactory.java index 2898dc9e806..ccef9ce5087 100644 --- a/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetFactory.java +++ b/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetFactory.java @@ -22,14 +22,6 @@ */ public interface DeviceAssetFactory extends KapuaObjectFactory { - /** - * Instantiates a new {@link DeviceAssets} instance. - * - * @return The newly instantiated {@link DeviceAssets}. - * @since 1.0.0 - */ - DeviceAssets newAssetListResult(); - /** * Instantiates a new {@link DeviceAsset} instance. * diff --git a/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetXmlRegistry.java b/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetXmlRegistry.java index 3756d7c6ae8..73d5e2b2d2c 100644 --- a/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetXmlRegistry.java +++ b/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssetXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.asset; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link DeviceAsset} XML factory class * @@ -26,16 +26,6 @@ public class DeviceAssetXmlRegistry { private final DeviceAssetFactory deviceAssetFactory = KapuaLocator.getInstance().getFactory(DeviceAssetFactory.class); - /** - * Instantiate a new {@link DeviceAssets}. - * - * @return The newly instantiate {@link DeviceAssets}. - * @since 1.0.0 - */ - public DeviceAssets newAssetListResult() { - return deviceAssetFactory.newAssetListResult(); - } - /** * Instantiate a new {@link DeviceAsset}. * diff --git a/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssets.java b/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssets.java index c5519a59607..5cd77306707 100644 --- a/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssets.java +++ b/service/device/management/asset/api/src/main/java/org/eclipse/kapua/service/device/management/asset/DeviceAssets.java @@ -12,14 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.asset; -import org.eclipse.kapua.KapuaSerializable; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import java.util.List; + +import org.eclipse.kapua.KapuaSerializable; /** * {@link DeviceAssets} definition. @@ -28,8 +30,12 @@ */ @XmlRootElement(name = "deviceAssets") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = DeviceAssetXmlRegistry.class, factoryMethod = "newAssetListResult") -public interface DeviceAssets extends KapuaSerializable { +@XmlType +public class DeviceAssets implements KapuaSerializable { + + private static final long serialVersionUID = -6657213220333406876L; + + private List assets; /** * Get the {@link DeviceAsset} {@link List} @@ -38,13 +44,22 @@ public interface DeviceAssets extends KapuaSerializable { * @since 1.0.0 */ @XmlElement(name = "deviceAsset") - List getAssets(); + public List getAssets() { + if (assets == null) { + assets = new ArrayList<>(); + } + + return assets; + } /** * Sets the {@link DeviceAsset} {@link List}. * - * @param assets The {@link DeviceAsset} {@link List}. + * @param assets + * The {@link DeviceAsset} {@link List}. * @since 1.0.0 */ - void setAssets(List assets); + public void setAssets(List assets) { + this.assets = assets; + } } diff --git a/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetFactoryImpl.java b/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetFactoryImpl.java index 50dc4e9a9b7..5dc8cff6e00 100644 --- a/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetFactoryImpl.java +++ b/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetFactoryImpl.java @@ -12,12 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.asset.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.service.device.management.asset.DeviceAsset; import org.eclipse.kapua.service.device.management.asset.DeviceAssetChannel; import org.eclipse.kapua.service.device.management.asset.DeviceAssetFactory; -import org.eclipse.kapua.service.device.management.asset.DeviceAssets; - -import javax.inject.Singleton; /** * {@link DeviceAssetFactory} implementation. @@ -27,11 +26,6 @@ @Singleton public class DeviceAssetFactoryImpl implements DeviceAssetFactory { - @Override - public DeviceAssets newAssetListResult() { - return new DeviceAssetsImpl(); - } - @Override public DeviceAsset newDeviceAsset() { return new DeviceAssetImpl(); diff --git a/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetManagementServiceImpl.java b/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetManagementServiceImpl.java index a0ef5363703..2b50eed84e8 100644 --- a/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetManagementServiceImpl.java +++ b/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetManagementServiceImpl.java @@ -12,6 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.asset.internal; +import java.util.Date; + +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.model.domains.Domains; import org.eclipse.kapua.commons.util.ArgumentValidator; @@ -39,9 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Singleton; -import java.util.Date; - /** * {@link DeviceAssetManagementService} implementation. * @@ -126,7 +127,7 @@ public DeviceAssets get(KapuaId scopeId, KapuaId deviceId, DeviceAssets deviceAs // Create event createDeviceEvent(scopeId, deviceId, assetRequestMessage, responseMessage); // Check response - DeviceAssets onlineDeviceAssets = checkResponseAcceptedOrThrowError(responseMessage, () -> responseMessage.getPayload().getDeviceAssets().orElse(deviceAssetFactory.newAssetListResult())); + DeviceAssets onlineDeviceAssets = checkResponseAcceptedOrThrowError(responseMessage, () -> responseMessage.getPayload().getDeviceAssets().orElse(new DeviceAssets())); // Store value and return if (deviceAssetStoreService.isServiceEnabled(scopeId) && deviceAssetStoreService.isApplicationEnabled(scopeId, deviceId)) { @@ -192,7 +193,7 @@ public DeviceAssets read(KapuaId scopeId, KapuaId deviceId, DeviceAssets deviceA // Create event createDeviceEvent(scopeId, deviceId, assetRequestMessage, responseMessage); // Check response - DeviceAssets onlineDeviceAssets = checkResponseAcceptedOrThrowError(responseMessage, () -> responseMessage.getPayload().getDeviceAssets().orElse(deviceAssetFactory.newAssetListResult())); + DeviceAssets onlineDeviceAssets = checkResponseAcceptedOrThrowError(responseMessage, () -> responseMessage.getPayload().getDeviceAssets().orElse(new DeviceAssets())); // Store value and return if (deviceAssetStoreService.isServiceEnabled(scopeId) && deviceAssetStoreService.isApplicationEnabled(scopeId, deviceId)) { @@ -258,6 +259,6 @@ public DeviceAssets write(KapuaId scopeId, KapuaId deviceId, DeviceAssets device // Create event createDeviceEvent(scopeId, deviceId, assetRequestMessage, responseMessage); // Check response - return checkResponseAcceptedOrThrowError(responseMessage, () -> responseMessage.getPayload().getDeviceAssets().orElse(deviceAssetFactory.newAssetListResult())); + return checkResponseAcceptedOrThrowError(responseMessage, () -> responseMessage.getPayload().getDeviceAssets().orElse(new DeviceAssets())); } } diff --git a/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetsImpl.java b/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetsImpl.java deleted file mode 100644 index 997e09c0bf5..00000000000 --- a/service/device/management/asset/internal/src/main/java/org/eclipse/kapua/service/device/management/asset/internal/DeviceAssetsImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.management.asset.internal; - -import org.eclipse.kapua.service.device.management.asset.DeviceAsset; -import org.eclipse.kapua.service.device.management.asset.DeviceAssets; - -import java.util.ArrayList; -import java.util.List; - -/** - * {@link DeviceAssets} implementation. - * - * @since 1.0.0 - */ -public class DeviceAssetsImpl implements DeviceAssets { - - private static final long serialVersionUID = -6657213220333406876L; - - private List assets; - - @Override - public List getAssets() { - if (assets == null) { - assets = new ArrayList<>(); - } - - return assets; - } - - @Override - public void setAssets(List assets) { - this.assets = assets; - } -} diff --git a/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationFactory.java b/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationFactory.java index e44a31feee6..c125842e2ed 100644 --- a/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationFactory.java +++ b/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationFactory.java @@ -19,6 +19,6 @@ * * @since 1.1.0 */ -public interface JobDeviceManagementOperationFactory extends KapuaEntityFactory { +public interface JobDeviceManagementOperationFactory extends KapuaEntityFactory { } diff --git a/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationListResult.java b/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationListResult.java index c7c8afb6642..5a8855a82d8 100644 --- a/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationListResult.java +++ b/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.job; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link JobDeviceManagementOperationListResult} definition. * @@ -26,7 +26,7 @@ */ @XmlRootElement(name = "jobDeviceManagementOperationListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = JobDeviceManagementOperationXmlRegistry.class, factoryMethod = "newJobDeviceManagementOperationListResult") -public interface JobDeviceManagementOperationListResult extends KapuaListResult { +@XmlType +public class JobDeviceManagementOperationListResult extends KapuaListResult { } diff --git a/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationXmlRegistry.java b/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationXmlRegistry.java index 604a0f8d1d0..f9b2513eb14 100644 --- a/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationXmlRegistry.java +++ b/service/device/management/job/api/src/main/java/org/eclipse/kapua/service/device/management/job/JobDeviceManagementOperationXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.job; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link JobDeviceManagementOperation} xml factory class * @@ -34,10 +34,6 @@ public JobDeviceManagementOperationCreator newJobDeviceManagementOperationCreato return jobDeviceManagementOperationFactory.newCreator(null); } - public JobDeviceManagementOperationListResult newJobDeviceManagementOperationListResult() { - return jobDeviceManagementOperationFactory.newListResult(); - } - public JobDeviceManagementOperationQuery newQuery() { return jobDeviceManagementOperationFactory.newQuery(null); } diff --git a/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationFactoryImpl.java b/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationFactoryImpl.java index cbd204575e2..3db27bf80c4 100644 --- a/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationFactoryImpl.java +++ b/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.job.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperation; import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperationCreator; import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperationFactory; -import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperationListResult; import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperationQuery; -import javax.inject.Singleton; - /** * {@link JobDeviceManagementOperationFactory} implementation. * @@ -45,11 +44,6 @@ public JobDeviceManagementOperationQuery newQuery(KapuaId scopeId) { return new JobDeviceManagementOperationQueryImpl(scopeId); } - @Override - public JobDeviceManagementOperationListResult newListResult() { - return new JobDeviceManagementOperationListResultImpl(); - } - @Override public JobDeviceManagementOperation clone(JobDeviceManagementOperation jobDeviceManagementOperation) { try { diff --git a/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationImplJpaRepository.java b/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationImplJpaRepository.java index dbd24d8cefb..68198b09322 100644 --- a/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationImplJpaRepository.java +++ b/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationImplJpaRepository.java @@ -21,7 +21,8 @@ public class JobDeviceManagementOperationImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements JobDeviceManagementOperationRepository { + public JobDeviceManagementOperationImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobDeviceManagementOperationImpl.class, JobDeviceManagementOperation.TYPE, () -> new JobDeviceManagementOperationListResultImpl(), jpaRepoConfig); + super(JobDeviceManagementOperationImpl.class, JobDeviceManagementOperation.TYPE, () -> new JobDeviceManagementOperationListResult(), jpaRepoConfig); } } diff --git a/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationListResultImpl.java b/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationListResultImpl.java deleted file mode 100644 index cfd1a91eaf7..00000000000 --- a/service/device/management/job/internal/src/main/java/org/eclipse/kapua/service/device/management/job/internal/JobDeviceManagementOperationListResultImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.management.job.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperation; -import org.eclipse.kapua.service.device.management.job.JobDeviceManagementOperationListResult; - -/** - * {@link JobDeviceManagementOperationListResult} implementation. - * - * @since 1.1.0 - */ -public class JobDeviceManagementOperationListResultImpl extends KapuaListResultImpl implements JobDeviceManagementOperationListResult { -} diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationFactory.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationFactory.java index 157f43cab15..bb1a7c27f9f 100644 --- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationFactory.java +++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationFactory.java @@ -20,14 +20,17 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface DeviceManagementOperationFactory extends KapuaEntityFactory { +public interface DeviceManagementOperationFactory extends KapuaEntityFactory { /** * Instantiates a new {@link DeviceManagementOperationProperty}. * - * @param name The name to set in the {@link DeviceManagementOperationProperty} - * @param propertyType The property type to set in the {@link DeviceManagementOperationProperty} - * @param propertyValue The property value to set in the {@link DeviceManagementOperationProperty} + * @param name + * The name to set in the {@link DeviceManagementOperationProperty} + * @param propertyType + * The property type to set in the {@link DeviceManagementOperationProperty} + * @param propertyValue + * The property value to set in the {@link DeviceManagementOperationProperty} * @return The newly instantiated {@link DeviceManagementOperationProperty} * @since 1.0.0 */ diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationListResult.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationListResult.java index 303304154d3..377b61fb8a6 100644 --- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationListResult.java +++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link DeviceManagementOperationListResult} definition. * @@ -26,7 +26,7 @@ */ @XmlRootElement(name = "deviceManagementOperationListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = DeviceManagementOperationXmlRegistry.class, factoryMethod = "newDeviceManagementOperationListResult") -public interface DeviceManagementOperationListResult extends KapuaListResult { +@XmlType +public class DeviceManagementOperationListResult extends KapuaListResult { } diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationXmlRegistry.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationXmlRegistry.java index 42f4859e536..827c836a9ac 100644 --- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationXmlRegistry.java +++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link DeviceManagementOperation} xml factory class * @@ -35,10 +35,6 @@ DeviceManagementOperationCreator newDeviceManagementOperationCreator() { return factory.newCreator(null); } - DeviceManagementOperationListResult newDeviceManagementOperationListResult() { - return factory.newListResult(); - } - DeviceManagementOperationQuery newQuery() { return factory.newQuery(null); } diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationFactory.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationFactory.java index b1c814e7366..8e8a3761efb 100644 --- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationFactory.java +++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface ManagementOperationNotificationFactory extends KapuaEntityFactory { +public interface ManagementOperationNotificationFactory extends KapuaEntityFactory { } diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationListResult.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationListResult.java index bc28b4ce399..6060a034194 100644 --- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationListResult.java +++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation.notification; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link ManagementOperationNotificationListResult} definition. * @@ -26,7 +26,7 @@ */ @XmlRootElement(name = "managementOperationNotificationListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = ManagementOperationNotificationXmlRegistry.class, factoryMethod = "newManagementOperationNotificationListResult") -public interface ManagementOperationNotificationListResult extends KapuaListResult { +@XmlType +public class ManagementOperationNotificationListResult extends KapuaListResult { } diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationXmlRegistry.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationXmlRegistry.java index 8e9ad286ab4..f98b3685674 100644 --- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationXmlRegistry.java +++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation.notification; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link ManagementOperationNotification} xml MANAGEMENT_OPERATION_NOTIFICATION_REGISTRY_FACTORY class * @@ -34,11 +34,6 @@ ManagementOperationNotificationCreator newManagementOperationNotificationCreator return managementOperationNotificationFactory.newCreator(null); } - - ManagementOperationNotificationListResult newManagementOperationNotificationListResult() { - return managementOperationNotificationFactory.newListResult(); - } - ManagementOperationNotificationQuery newQuery() { return managementOperationNotificationFactory.newQuery(null); } diff --git a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationFactoryImpl.java b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationFactoryImpl.java index 3f1802d340d..d9a977b8528 100644 --- a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationFactoryImpl.java +++ b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationFactoryImpl.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperation; import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationCreator; import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationFactory; -import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationListResult; import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationProperty; import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationQuery; -import javax.inject.Singleton; - /** * {@link DeviceManagementOperationFactory} implementation * @@ -46,11 +45,6 @@ public DeviceManagementOperationQuery newQuery(KapuaId scopeId) { return new DeviceManagementOperationQueryImpl(scopeId); } - @Override - public DeviceManagementOperationListResult newListResult() { - return new DeviceManagementOperationListResultImpl(); - } - @Override public DeviceManagementOperationProperty newStepProperty(String name, String propertyType, String propertyValue) { return new DeviceManagementOperationPropertyImpl(name, propertyType, propertyValue); diff --git a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationListResultImpl.java b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationListResultImpl.java deleted file mode 100644 index 70231c167da..00000000000 --- a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.management.registry.operation.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperation; -import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationListResult; - -/** - * {@link DeviceManagementOperationListResultImpl} definition. - * - * @since 1.0.0 - */ -public class DeviceManagementOperationListResultImpl extends KapuaListResultImpl implements DeviceManagementOperationListResult { - -} diff --git a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationRepositoryImplJpaRepository.java b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationRepositoryImplJpaRepository.java index 0912d291a5a..32914d8fbfd 100644 --- a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationRepositoryImplJpaRepository.java +++ b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/internal/DeviceManagementOperationRepositoryImplJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation.internal; +import java.util.Optional; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaUpdatableEntityJpaRepository; @@ -21,13 +23,12 @@ import org.eclipse.kapua.service.device.management.registry.operation.DeviceManagementOperationRepository; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class DeviceManagementOperationRepositoryImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements DeviceManagementOperationRepository { + public DeviceManagementOperationRepositoryImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(DeviceManagementOperationImpl.class, DeviceManagementOperation.TYPE, () -> new DeviceManagementOperationListResultImpl(), jpaRepoConfig); + super(DeviceManagementOperationImpl.class, DeviceManagementOperation.TYPE, () -> new DeviceManagementOperationListResult(), jpaRepoConfig); } @Override diff --git a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationFactoryImpl.java b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationFactoryImpl.java index a6303dc87c9..5140ad1768b 100644 --- a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationFactoryImpl.java +++ b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationFactoryImpl.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.management.registry.operation.notification.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotification; import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotificationCreator; import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotificationFactory; -import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotificationListResult; import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotificationQuery; -import javax.inject.Singleton; - /** * {@link ManagementOperationNotificationFactory} implementation. * @@ -44,11 +43,6 @@ public ManagementOperationNotificationQuery newQuery(KapuaId scopeId) { return new ManagementOperationNotificationQueryImpl(scopeId); } - @Override - public ManagementOperationNotificationListResult newListResult() { - return new ManagementOperationNotificationListResultImpl(); - } - @Override public ManagementOperationNotification clone(ManagementOperationNotification managementOperationNotification) { return new ManagementOperationNotificationImpl(managementOperationNotification); diff --git a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationImplJpaRepository.java b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationImplJpaRepository.java index 0851913ef21..48e3e245194 100644 --- a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationImplJpaRepository.java +++ b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationImplJpaRepository.java @@ -21,7 +21,8 @@ public class ManagementOperationNotificationImplJpaRepository extends KapuaEntityJpaRepository implements ManagementOperationNotificationRepository { + public ManagementOperationNotificationImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(ManagementOperationNotificationImpl.class, ManagementOperationNotification.TYPE, () -> new ManagementOperationNotificationListResultImpl(), configuration); + super(ManagementOperationNotificationImpl.class, ManagementOperationNotification.TYPE, () -> new ManagementOperationNotificationListResult(), configuration); } } diff --git a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationListResultImpl.java b/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationListResultImpl.java deleted file mode 100644 index 55063328ae2..00000000000 --- a/service/device/management/registry/internal/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/internal/ManagementOperationNotificationListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.management.registry.operation.notification.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotification; -import org.eclipse.kapua.service.device.management.registry.operation.notification.ManagementOperationNotificationListResult; - -/** - * {@link ManagementOperationNotificationListResultImpl} definition. - * - * @since 1.0.0 - */ -public class ManagementOperationNotificationListResultImpl extends KapuaListResultImpl implements ManagementOperationNotificationListResult { - -} diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceFactory.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceFactory.java index 6a526e6d7b5..6960844892b 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceFactory.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceFactory.java @@ -21,13 +21,15 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface DeviceFactory extends KapuaEntityFactory { +public interface DeviceFactory extends KapuaEntityFactory { /** * Instantiates a new {@link DeviceCreator} * - * @param scopeId The scope {@link KapuaId} to set into the {@link DeviceCreator} - * @param clientId The client id to set into the {@link DeviceCreator} + * @param scopeId + * The scope {@link KapuaId} to set into the {@link DeviceCreator} + * @param clientId + * The client id to set into the {@link DeviceCreator} * @return The newly instantiated {@link DeviceCreator}. * @since 1.0.0 * @deprecated Since 1.5.0. Please use {@link #newCreator(KapuaId)}. @@ -38,9 +40,12 @@ public interface DeviceFactory extends KapuaEntityFactory { +@XmlType +public class DeviceListResult extends KapuaListResult { + + private static final long serialVersionUID = -3870951363076544938L; } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceXmlRegistry.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceXmlRegistry.java index 573905a636b..36f44928f1d 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceXmlRegistry.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link Device} xml factory class * @@ -46,16 +46,6 @@ public DeviceCreator newDeviceCreator() { return deviceFactory.newCreator(null, null); } - /** - * Creates a new device list result - * - * @return - * @since 1.0.0 - */ - public DeviceListResult newDeviceListResult() { - return deviceFactory.newListResult(); - } - public DeviceQuery newQuery() { return deviceFactory.newQuery(null); } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionFactory.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionFactory.java index f2340123de1..a19a31be804 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionFactory.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface DeviceConnectionFactory extends KapuaEntityFactory { +public interface DeviceConnectionFactory extends KapuaEntityFactory { } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionListResult.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionListResult.java index e37886dcaa6..5203c40b686 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionListResult.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionListResult.java @@ -23,6 +23,8 @@ * @since 1.0 */ @XmlRootElement(name = "deviceConnections") -@XmlType(factoryClass = DeviceConnectionXmlRegistry.class, factoryMethod = "newDeviceConnectionListResult") -public interface DeviceConnectionListResult extends KapuaListResult { +@XmlType +public class DeviceConnectionListResult extends KapuaListResult { + + private static final long serialVersionUID = -4450707993798807403L; } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionXmlRegistry.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionXmlRegistry.java index b4812c01608..d9b01446c9f 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionXmlRegistry.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnectionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.connection; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link DeviceConnection} xml factory class * @@ -35,15 +35,6 @@ public DeviceConnection newDeviceConnection() { return deviceConnectionFactory.newEntity(null); } - /** - * Creates a new device list result - * - * @return - */ - public DeviceConnectionListResult newDeviceConnectionListResult() { - return deviceConnectionFactory.newListResult(); - } - public DeviceConnectionQuery newQuery() { return deviceConnectionFactory.newQuery(null); } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionFactory.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionFactory.java index 231671e4ec2..2c5ee017b0a 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionFactory.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface DeviceConnectionOptionFactory extends KapuaEntityFactory { +public interface DeviceConnectionOptionFactory extends KapuaEntityFactory { } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionListResult.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionListResult.java index 35281032b68..cefbaaf77ac 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionListResult.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionListResult.java @@ -23,6 +23,8 @@ * @since 1.0.0 */ @XmlRootElement(name = "deviceConnectionOptions") -@XmlType(factoryClass = DeviceConnectionOptionXmlRegistry.class, factoryMethod = "newDeviceConnectionOptionListResult") -public interface DeviceConnectionOptionListResult extends KapuaListResult { +@XmlType +public class DeviceConnectionOptionListResult extends KapuaListResult { + + private static final long serialVersionUID = -4450707993798807403L; } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionXmlRegistry.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionXmlRegistry.java index c2da267c5a2..39c5b6fbf7d 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionXmlRegistry.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/DeviceConnectionOptionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.connection.option; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link DeviceConnectionOptionService} XML factory class * @@ -35,15 +35,6 @@ public DeviceConnectionOption newDeviceConnectionOption() { return deviceConnectionOptionFactory.newEntity(null); } - /** - * Creates a new device connection options list result - * - * @return - */ - public DeviceConnectionOptionListResult newDeviceConnectionOptionListResult() { - return deviceConnectionOptionFactory.newListResult(); - } - public DeviceConnectionOptionQuery newQuery() { return deviceConnectionOptionFactory.newQuery(null); } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventFactory.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventFactory.java index f6bd2fe9d1e..8ec7d44c5a8 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventFactory.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventFactory.java @@ -12,26 +12,30 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.event; +import java.util.Date; + import org.eclipse.kapua.model.KapuaEntityFactory; import org.eclipse.kapua.model.id.KapuaId; -import java.util.Date; - /** * {@link DeviceEventFactory} definition. * * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface DeviceEventFactory extends KapuaEntityFactory { +public interface DeviceEventFactory extends KapuaEntityFactory { /** * Instantiates a new {@link DeviceEventCreator} * - * @param scopeId The scope {@link KapuaId} to be set in the {@link DeviceEventCreator} - * @param deviceId The {@link org.eclipse.kapua.service.device.registry.Device} {@link KapuaId} to be set in the {@link DeviceEventCreator} - * @param receivedOn The received on {@link KapuaId} to be set in the {@link DeviceEventCreator} - * @param resource The resource {@link KapuaId} to be set in the {@link DeviceEventCreator} + * @param scopeId + * The scope {@link KapuaId} to be set in the {@link DeviceEventCreator} + * @param deviceId + * The {@link org.eclipse.kapua.service.device.registry.Device} {@link KapuaId} to be set in the {@link DeviceEventCreator} + * @param receivedOn + * The received on {@link KapuaId} to be set in the {@link DeviceEventCreator} + * @param resource + * The resource {@link KapuaId} to be set in the {@link DeviceEventCreator} * @return The newly instantiated {@link DeviceEventCreator} * @since 1.0.0 */ diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventListResult.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventListResult.java index a15cf87c0c4..6e834d0ccb3 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventListResult.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventListResult.java @@ -23,11 +23,12 @@ * Device event list definition. * * @since 1.0 - * */ @XmlRootElement(name = "deviceEventListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = DeviceEventXmlRegistry.class, factoryMethod = "newDeviceEventListResult") -public interface DeviceEventListResult extends KapuaListResult { +@XmlType +public class DeviceEventListResult extends KapuaListResult { + + private static final long serialVersionUID = 6537888946643944463L; } diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventXmlRegistry.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventXmlRegistry.java index ca95c3f14eb..aff51f6f7ef 100644 --- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventXmlRegistry.java +++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEventXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.event; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link DeviceEvent} xml factory class. * @@ -35,15 +35,6 @@ public DeviceEvent newDeviceEvent() { return deviceEventFactory.newEntity(null); } - /** - * Creates a new device event list result - * - * @return - */ - public DeviceEventListResult newDeviceEventListResult() { - return deviceEventFactory.newListResult(); - } - public DeviceEventQuery newQuery() { return deviceEventFactory.newQuery(null); } diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionFactoryImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionFactoryImpl.java index 2cfb367a158..d1c1f083156 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionFactoryImpl.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.connection.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.registry.connection.DeviceConnection; import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionCreator; import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionFactory; -import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionListResult; import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionQuery; -import javax.inject.Singleton; - /** * {@link DeviceConnectionFactory} implementation. * @@ -45,11 +44,6 @@ public DeviceConnection newEntity(KapuaId scopeId) { return new DeviceConnectionImpl(scopeId); } - @Override - public DeviceConnectionListResult newListResult() { - return new DeviceConnectionListResultImpl(); - } - @Override public DeviceConnection clone(DeviceConnection deviceConnection) { try { diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionImplJpaRepository.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionImplJpaRepository.java index 43a5329bcff..2dd44dedb61 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionImplJpaRepository.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionImplJpaRepository.java @@ -28,7 +28,7 @@ public class DeviceConnectionImplJpaRepository implements DeviceConnectionRepository { public DeviceConnectionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(DeviceConnectionImpl.class, DeviceConnection.TYPE, () -> new DeviceConnectionListResultImpl(), jpaRepoConfig); + super(DeviceConnectionImpl.class, DeviceConnection.TYPE, () -> new DeviceConnectionListResult(), jpaRepoConfig); } @Override diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionListResultImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionListResultImpl.java deleted file mode 100644 index c8414fe0915..00000000000 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.registry.connection.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.registry.connection.DeviceConnection; -import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionListResult; - -/** - * Device connection list. - * - * @since 1.0 - */ -public class DeviceConnectionListResultImpl extends KapuaListResultImpl implements DeviceConnectionListResult { - private static final long serialVersionUID = -4450707993798807403L; -} diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionFactoryImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionFactoryImpl.java index cc6a3a70378..fb9249787ad 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionFactoryImpl.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.connection.option.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOption; import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionCreator; import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionFactory; -import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionListResult; import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionQuery; -import javax.inject.Singleton; - /** * {@link DeviceConnectionOptionFactory} implementation. * @@ -45,11 +44,6 @@ public DeviceConnectionOption newEntity(KapuaId scopeId) { return new DeviceConnectionOptionImpl(scopeId); } - @Override - public DeviceConnectionOptionListResult newListResult() { - return new DeviceConnectionOptionListResultImpl(); - } - @Override public DeviceConnectionOption clone(DeviceConnectionOption deviceConnectionOption) { try { diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionImplJpaRepository.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionImplJpaRepository.java index 63375409a5a..930c2344323 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionImplJpaRepository.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionImplJpaRepository.java @@ -21,7 +21,8 @@ public class DeviceConnectionOptionImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements DeviceConnectionOptionRepository { + public DeviceConnectionOptionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(DeviceConnectionOptionImpl.class, DeviceConnectionOption.TYPE, () -> new DeviceConnectionOptionListResultImpl(), jpaRepoConfig); + super(DeviceConnectionOptionImpl.class, DeviceConnectionOption.TYPE, () -> new DeviceConnectionOptionListResult(), jpaRepoConfig); } } diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionListResultImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionListResultImpl.java deleted file mode 100644 index 002d804adcb..00000000000 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/option/internal/DeviceConnectionOptionListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.registry.connection.option.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOption; -import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionListResult; - -/** - * Device connection options list. - * - * @since 1.0.0 - */ -public class DeviceConnectionOptionListResultImpl extends KapuaListResultImpl implements DeviceConnectionOptionListResult { - - private static final long serialVersionUID = -4450707993798807403L; -} diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventFactoryImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventFactoryImpl.java index 223cc0e63d6..1011a7d50f4 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventFactoryImpl.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventFactoryImpl.java @@ -12,17 +12,17 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.event.internal; +import java.util.Date; + +import javax.inject.Singleton; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.management.message.KapuaMethod; import org.eclipse.kapua.service.device.registry.event.DeviceEvent; import org.eclipse.kapua.service.device.registry.event.DeviceEventCreator; import org.eclipse.kapua.service.device.registry.event.DeviceEventFactory; -import org.eclipse.kapua.service.device.registry.event.DeviceEventListResult; import org.eclipse.kapua.service.device.registry.event.DeviceEventQuery; -import javax.inject.Singleton; -import java.util.Date; - /** * {@link DeviceEventFactory} implementation. * @@ -58,11 +58,6 @@ public DeviceEventCreator newCreator(KapuaId scopeId) { return new DeviceEventCreatorImpl(scopeId); } - @Override - public DeviceEventListResult newListResult() { - return new DeviceEventListResultImpl(); - } - @Override public DeviceEvent clone(DeviceEvent deviceEvent) { return new DeviceEventImpl(deviceEvent); diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventImplJpaRepository.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventImplJpaRepository.java index f77f26fadd7..4ff3d01f411 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventImplJpaRepository.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventImplJpaRepository.java @@ -21,7 +21,8 @@ public class DeviceEventImplJpaRepository extends KapuaEntityJpaRepository implements DeviceEventRepository { + public DeviceEventImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(DeviceEventImpl.class, DeviceEvent.TYPE, () -> new DeviceEventListResultImpl(), configuration); + super(DeviceEventImpl.class, DeviceEvent.TYPE, () -> new DeviceEventListResult(), configuration); } } diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventListResultImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventListResultImpl.java deleted file mode 100644 index aba3659c2d0..00000000000 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/event/internal/DeviceEventListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.registry.event.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.registry.event.DeviceEvent; -import org.eclipse.kapua.service.device.registry.event.DeviceEventListResult; - -/** - * Device event list. - * - * @since 1.0 - */ -public class DeviceEventListResultImpl extends KapuaListResultImpl implements DeviceEventListResult { - - private static final long serialVersionUID = 6537888946643944463L; -} diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceFactoryImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceFactoryImpl.java index 70524bf2ba0..b4483e0f333 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceFactoryImpl.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceFactoryImpl.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.device.registry.Device; import org.eclipse.kapua.service.device.registry.DeviceCreator; import org.eclipse.kapua.service.device.registry.DeviceExtendedProperty; import org.eclipse.kapua.service.device.registry.DeviceFactory; -import org.eclipse.kapua.service.device.registry.DeviceListResult; import org.eclipse.kapua.service.device.registry.DeviceQuery; -import javax.inject.Singleton; - /** * {@link DeviceFactory} implementation. * @@ -43,11 +42,6 @@ public DeviceQuery newQuery(KapuaId scopeId) { return new DeviceQueryImpl(scopeId); } - @Override - public DeviceListResult newListResult() { - return new DeviceListResultImpl(); - } - @Override public Device newEntity(KapuaId scopeId) { return new DeviceImpl(scopeId); diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceImplJpaRepository.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceImplJpaRepository.java index 2be2228b60a..503a877deb1 100644 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceImplJpaRepository.java +++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceImplJpaRepository.java @@ -12,7 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.device.registry.internal; -import com.google.common.collect.Lists; +import java.util.Optional; + +import javax.persistence.EntityManager; +import javax.persistence.LockModeType; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.JpaAwareTxContext; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; @@ -24,15 +28,14 @@ import org.eclipse.kapua.service.device.registry.DeviceRepository; import org.eclipse.kapua.storage.TxContext; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import java.util.Optional; +import com.google.common.collect.Lists; public class DeviceImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements DeviceRepository { + public DeviceImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(DeviceImpl.class, Device.TYPE, () -> new DeviceListResultImpl(), jpaRepoConfig); + super(DeviceImpl.class, Device.TYPE, () -> new DeviceListResult(), jpaRepoConfig); } @Override diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceListResultImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceListResultImpl.java deleted file mode 100644 index 4f3543482cb..00000000000 --- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.device.registry.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.device.registry.Device; -import org.eclipse.kapua.service.device.registry.DeviceListResult; - -/** - * Device list result implementation. - * - * @since 1.0 - */ -public class DeviceListResultImpl extends KapuaListResultImpl implements DeviceListResult { - - private static final long serialVersionUID = -3870951363076544938L; -} diff --git a/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/BrokerSteps.java b/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/BrokerSteps.java index c0e71b9b03b..e6ccc530895 100644 --- a/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/BrokerSteps.java +++ b/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/BrokerSteps.java @@ -32,7 +32,6 @@ import org.eclipse.kapua.service.device.management.asset.DeviceAssetChannel; import org.eclipse.kapua.service.device.management.asset.DeviceAssetManagementService; import org.eclipse.kapua.service.device.management.asset.DeviceAssets; -import org.eclipse.kapua.service.device.management.asset.internal.DeviceAssetsImpl; import org.eclipse.kapua.service.device.management.bundle.DeviceBundle; import org.eclipse.kapua.service.device.management.bundle.DeviceBundleManagementService; import org.eclipse.kapua.service.device.management.bundle.DeviceBundles; @@ -72,9 +71,7 @@ import io.cucumber.java.en.When; /** - * Steps used in integration scenarios with running MQTT broker and process of - * registering mocked Kura device registering with Kapua and issuing basic administrative - * commands on Mocked Kura. + * Steps used in integration scenarios with running MQTT broker and process of registering mocked Kura device registering with Kapua and issuing basic administrative commands on Mocked Kura. */ @Singleton public class BrokerSteps extends TestBase { @@ -252,8 +249,10 @@ public void deviceBirthMessage() throws Exception { /** * Checks that the {@link Device} with the given {@link Device#getClientId()} has {@link DeviceConnection#getStatus()} {@link DeviceConnectionStatus#CONNECTED} within the given time. * - * @param clientId The {@link Device#getClientId()} to check - * @param waitSeconds The max time of wait in seconds + * @param clientId + * The {@link Device#getClientId()} to check + * @param waitSeconds + * The max time of wait in seconds * @throws Exception * @since 1.2.0 */ @@ -261,7 +260,7 @@ public void deviceBirthMessage() throws Exception { public void deviceConnected(String clientId, int waitSeconds) throws Exception { long now = System.currentTimeMillis(); - while ((System.currentTimeMillis() - now) < (waitSeconds * 1000L)){ + while ((System.currentTimeMillis() - now) < (waitSeconds * 1000L)) { Device kuraDevice = deviceRegistryService.findByClientId(getCurrentScopeId(), clientId); if (kuraDevice != null && @@ -493,7 +492,6 @@ public void deviceWithServerIp(String serverIp) { Assert.assertEquals(serverIp, deviceConn.getServerIp()); } - @When("Client with name {string} with client id {string} user {string} password {string} is connected") public void clientConnect(String clientName, String clientId, String user, String password) throws Exception { MqttClient mqttClient = null; @@ -570,7 +568,7 @@ public void disconnectConnectionWithClientId(String clientId) throws Exception { @Then("Device(s) status is {string} within {int} second(s) for client id {string}") public void deviceStatusIs(String expectedStatus, int timeout, String clientId) throws Exception { String currentStatus = null; - while(!expectedStatus.equals(currentStatus) && timeout-->0) { + while (!expectedStatus.equals(currentStatus) && timeout-- > 0) { Thread.sleep(1000); logger.info("Device(s) status countdown check: {}", timeout); @@ -619,7 +617,7 @@ public void iAddDeviceToKuraMock(int numberOfDevices) { @And("Device assets are requested") public void deviceAssetsAreRequested() throws Exception { - DeviceAssets deviceAssets = new DeviceAssetsImpl(); + DeviceAssets deviceAssets = new DeviceAssets(); for (KuraDevice kuraDevice : kuraDevices) { Device device = deviceRegistryService.findByClientId(SYS_SCOPE_ID, kuraDevice.getClientId()); Assert.assertNotNull(device); diff --git a/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/DeviceRegistrySteps.java b/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/DeviceRegistrySteps.java index a970d78eeff..0f70b334561 100644 --- a/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/DeviceRegistrySteps.java +++ b/service/device/registry/test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/DeviceRegistrySteps.java @@ -23,18 +23,9 @@ import java.util.Set; import java.util.UUID; import java.util.Vector; + import javax.inject.Inject; -import com.google.common.base.Strings; -import com.google.common.collect.Lists; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; import org.apache.commons.lang3.StringUtils; import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.model.id.KapuaEid; @@ -115,12 +106,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Strings; +import com.google.common.collect.Lists; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; + /** * Implementation of Gherkin steps used in DeviceRegistry.feature scenarios. *

    - * MockedLocator is used for Location Service. Mockito is used to mock other - * services that the Device Registry services dependent on. Dependent services are: - - * Authorization Service - + * MockedLocator is used for Location Service. Mockito is used to mock other services that the Device Registry services dependent on. Dependent services are: - Authorization Service - */ @Singleton public class DeviceRegistrySteps extends TestBase { @@ -178,7 +179,6 @@ public class DeviceRegistrySteps extends TestBase { private DeviceEventService eventService; private DeviceEventFactory eventFactory; - // Additional service references for integration testing private DeviceLifeCycleService deviceLifeCycleService; private AccountService accountService; @@ -391,7 +391,6 @@ public void createDevicesWithParametersAndConnection(List devLst) thr createDevicesAsSpecifiedInternal(devLst, deviceConnection); } - private void createDevicesAsSpecifiedInternal(List cucDevices, DeviceConnection deviceConnection) throws Exception { primeException(); try { @@ -1004,7 +1003,7 @@ public void exerciseAllDeviceFactoryFunctions() { tmpDevice = deviceFactory.newEntity(SYS_SCOPE_ID); tmpCreator = deviceFactory.newCreator(SYS_SCOPE_ID); tmpQuery = deviceFactory.newQuery(SYS_SCOPE_ID); - tmpListRes = deviceFactory.newListResult(); + tmpListRes = new DeviceListResult(); Assert.assertNotNull(tmpDevice); Assert.assertNotNull(tmpCreator); Assert.assertNotNull(tmpQuery); @@ -1071,7 +1070,7 @@ public void createConnections(List cucConnections) throws Excepti DeviceConnectionCreator connectionCreator = null; DeviceConnection deviceConnection = null; - DeviceConnectionListResult deviceConnections = deviceConnectionFactory.newListResult(); + DeviceConnectionListResult deviceConnections = new DeviceConnectionListResult(); for (CucConnection cucConnection : cucConnections) { connectionCreator = deviceConnectionFactory.newCreator(scopeId); @@ -1083,7 +1082,8 @@ public void createConnections(List cucConnections) throws Excepti connectionCreator.setServerIp(cucConnection.getServerIp()); connectionCreator.setProtocol(cucConnection.getProtocol()); connectionCreator.setAllowUserChange(false); - connectionCreator.setAuthenticationType(deviceConnectionService.getAvailableAuthTypes().stream().findFirst().orElseThrow(() -> new IllegalStateException("No DeviceConnection authenticationTypes are available for testing"))); + connectionCreator.setAuthenticationType(deviceConnectionService.getAvailableAuthTypes().stream().findFirst() + .orElseThrow(() -> new IllegalStateException("No DeviceConnection authenticationTypes are available for testing"))); deviceConnection = deviceConnectionService.create(connectionCreator); deviceConnections.addItem(deviceConnection); } @@ -1613,14 +1613,14 @@ public void checkEventList(int number) throws Exception { private void printEvents(DeviceEventListResult eventList, int count) throws Exception { logger.info("Events size: {}", eventList.getSize()); eventList.getItems().forEach((event) -> logger.info("\ttype: {} - id: {} - date: {} - {}", event.getType(), event.getDeviceId(), event.getCreatedOn(), event.getEventMessage())); -// if (count > eventList.getSize()) { -// logger.info("++++++++++++++++++++++++++++++++++++++++++++++++\n===========================================================\n\n"); -// Thread.sleep(30000); -// searchForEventsFromDeviceWithClientID("rpione3", "kapua-sys" ); -// eventList = (DeviceEventListResult) stepData.get(DEVICE_EVENT_LIST); -// eventList.getItems().forEach((event) -> logger.info("\ttype: {} - id: {} - date: {} - {}", event.getType(), event.getDeviceId(), event.getCreatedOn(), event.getEventMessage())); -// logger.info("++++++++++++++++++++++++++++++++++++++++++++++++\n===========================================================\n\n"); -// } + // if (count > eventList.getSize()) { + // logger.info("++++++++++++++++++++++++++++++++++++++++++++++++\n===========================================================\n\n"); + // Thread.sleep(30000); + // searchForEventsFromDeviceWithClientID("rpione3", "kapua-sys" ); + // eventList = (DeviceEventListResult) stepData.get(DEVICE_EVENT_LIST); + // eventList.getItems().forEach((event) -> logger.info("\ttype: {} - id: {} - date: {} - {}", event.getType(), event.getDeviceId(), event.getCreatedOn(), event.getEventMessage())); + // logger.info("++++++++++++++++++++++++++++++++++++++++++++++++\n===========================================================\n\n"); + // } } @Then("There is no such event") @@ -1637,7 +1637,7 @@ public void exerciseAllEventFactoryFunctions() { tmpEvent = eventFactory.newEntity(SYS_SCOPE_ID); tmpCreator = eventFactory.newCreator(SYS_SCOPE_ID, getKapuaId(), new Date(), ""); tmpQuery = eventFactory.newQuery(SYS_SCOPE_ID); - tmpList = eventFactory.newListResult(); + tmpList = new DeviceEventListResult(); Assert.assertNotNull(tmpEvent); Assert.assertNotNull(tmpCreator); Assert.assertNotNull(tmpQuery); @@ -1661,7 +1661,7 @@ public void checkDeviceEventDomainUpdate() { @When("I search for the device {string} in account {string}") public void searchForDeviceWithClientID(String clientId, String account) throws Exception { - DeviceListResult tmpList = deviceFactory.newListResult(); + DeviceListResult tmpList = new DeviceListResult(); primeException(); try { stepData.remove(DEVICE); @@ -1886,7 +1886,6 @@ public void createAnApplicationMessage(String clientId) throws Exception { } } - @Given("Such a set of privileged users for account {string}") public void createPrivilegedUsers(String accName, List users) throws Throwable { KapuaSecurityUtils.doPrivileged(() -> { @@ -1935,7 +1934,8 @@ public void createConnectionForDevice(List connections) throws Ka tmpCreator.setReservedUserId(tmpConn.getReservedUserId()); tmpCreator.setAllowUserChange(tmpConn.getAllowUserChange()); tmpCreator.setUserCouplingMode(tmpConn.getUserCouplingMode()); - tmpCreator.setAuthenticationType(deviceConnectionService.getAvailableAuthTypes().stream().findFirst().orElseThrow(() -> new IllegalStateException("No DeviceConnection authenticationTypes are available for testing"))); + tmpCreator.setAuthenticationType(deviceConnectionService.getAvailableAuthTypes().stream().findFirst() + .orElseThrow(() -> new IllegalStateException("No DeviceConnection authenticationTypes are available for testing"))); DeviceConnection tmpDevConn = deviceConnectionService.create(tmpCreator); tmpDevConn.setStatus(DeviceConnectionStatus.DISCONNECTED); deviceConnectionService.update(tmpDevConn); @@ -1953,7 +1953,7 @@ public void searchForConnectionFromDeviceWithClientID(String clientId, String ac KapuaSecurityUtils.doPrivileged(() -> { Account tmpAcc; DeviceConnection tmpConn; - DeviceConnectionListResult tmpConnLst = deviceConnectionFactory.newListResult(); + DeviceConnectionListResult tmpConnLst = new DeviceConnectionListResult(); tmpAcc = accountService.findByName(account); Assert.assertNotNull(tmpAcc); Assert.assertNotNull(tmpAcc.getId()); @@ -1999,7 +1999,8 @@ public void searchForConnectionFromDeviceWithClientIDStatusAndUser(String client searchForConnectionFromDeviceWithClientIDStatusAndUser(clientId, account.getId(), status, connectionUserId.getId(), true); } - private boolean searchForConnectionFromDeviceWithClientIDStatusAndUser(String clientId, KapuaId accountId, String connectionStatus, KapuaId connectionUserId, boolean timeoutOccurred) throws Exception { + private boolean searchForConnectionFromDeviceWithClientIDStatusAndUser(String clientId, KapuaId accountId, String connectionStatus, KapuaId connectionUserId, boolean timeoutOccurred) + throws Exception { try { Device device = deviceRegistryService.findByClientId(accountId, clientId); if (timeoutOccurred) { @@ -2022,7 +2023,7 @@ private boolean searchForConnectionFromDeviceWithClientIDStatusAndUser(String cl } } stepData.put(DEVICE_CONNECTION, deviceConnection); - DeviceConnectionListResult tmpConnLst = deviceConnectionFactory.newListResult(); + DeviceConnectionListResult tmpConnLst = new DeviceConnectionListResult(); Vector dcv = new Vector<>(); dcv.add(deviceConnection); tmpConnLst.addItems(dcv); @@ -2193,7 +2194,8 @@ private DeviceConnectionCreator prepareRegularConnectionCreator(KapuaId scopeId, creator.setServerIp(SERVER_IP); creator.setProtocol("tcp"); creator.setAllowUserChange(false); - creator.setAuthenticationType(deviceConnectionService.getAvailableAuthTypes().stream().findFirst().orElseThrow(() -> new IllegalStateException("No DeviceConnection authenticationTypes are available for testing"))); + creator.setAuthenticationType( + deviceConnectionService.getAvailableAuthTypes().stream().findFirst().orElseThrow(() -> new IllegalStateException("No DeviceConnection authenticationTypes are available for testing"))); return creator; } @@ -2226,24 +2228,24 @@ private DeviceEventCreator prepareRegularDeviceEventCreator(KapuaId accountId, K private KapuaMethod getMethodFromString(String name) { KapuaMethod tmpMeth = null; switch (name.trim().toUpperCase()) { - case "READ": - tmpMeth = KapuaMethod.READ; - break; - case "CREATE": - tmpMeth = KapuaMethod.CREATE; - break; - case "WRITE": - tmpMeth = KapuaMethod.WRITE; - break; - case "DELETE": - tmpMeth = KapuaMethod.DELETE; - break; - case "OPTIONS": - tmpMeth = KapuaMethod.OPTIONS; - break; - case "EXECUTE": - tmpMeth = KapuaMethod.EXECUTE; - break; + case "READ": + tmpMeth = KapuaMethod.READ; + break; + case "CREATE": + tmpMeth = KapuaMethod.CREATE; + break; + case "WRITE": + tmpMeth = KapuaMethod.WRITE; + break; + case "DELETE": + tmpMeth = KapuaMethod.DELETE; + break; + case "OPTIONS": + tmpMeth = KapuaMethod.OPTIONS; + break; + case "EXECUTE": + tmpMeth = KapuaMethod.EXECUTE; + break; } Assert.assertNotNull(tmpMeth); return tmpMeth; @@ -2454,34 +2456,34 @@ private DeviceCreator prepareDeviceCreatorFromCucDevice(CucDevice cucDevice) { DeviceConnectionStatus parseConnectionStatusString(String stat) { switch (stat.trim().toUpperCase()) { - case "CONNECTED": - return DeviceConnectionStatus.CONNECTED; - case "DISCONNECTED": - return DeviceConnectionStatus.DISCONNECTED; - case "MISSING": - return DeviceConnectionStatus.MISSING; + case "CONNECTED": + return DeviceConnectionStatus.CONNECTED; + case "DISCONNECTED": + return DeviceConnectionStatus.DISCONNECTED; + case "MISSING": + return DeviceConnectionStatus.MISSING; } return null; } ConnectionUserCouplingMode parseConnectionCouplingString(String mode) { switch (mode.trim().toUpperCase()) { - case "INHERITED": - return ConnectionUserCouplingMode.INHERITED; - case "LOOSE": - return ConnectionUserCouplingMode.LOOSE; - case "STRICT": - return ConnectionUserCouplingMode.STRICT; + case "INHERITED": + return ConnectionUserCouplingMode.INHERITED; + case "LOOSE": + return ConnectionUserCouplingMode.LOOSE; + case "STRICT": + return ConnectionUserCouplingMode.STRICT; } return null; } boolean parseBooleanFromString(String value) { switch (value.trim().toLowerCase()) { - case "true": - return true; - case "false": - return false; + case "true": + return true; + case "false": + return false; } return false; } @@ -2501,7 +2503,6 @@ public void iCreateADeviceWithName(String clientId) throws Exception { } } - @Then("I create a device with name {string} and tags") public void iCreateADeviceWithName(String clientId, List tags) throws Exception { final HashSet tagIds = new HashSet<>(); @@ -2813,7 +2814,6 @@ private void iChangeDeviceLastEventIdTo(String lastEventId) throws Throwable { } } - @And("The devices display name is {string}") public void theDevicesDisplayNameIs(String displayName) throws Throwable { Device device = (Device) stepData.get(DEVICE); diff --git a/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoFactory.java b/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoFactory.java index ace01e1d96f..73f8dd57b48 100644 --- a/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoFactory.java +++ b/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoFactory.java @@ -19,12 +19,13 @@ * * @since 1.0.0 */ -public interface EndpointInfoFactory extends KapuaEntityFactory { +public interface EndpointInfoFactory extends KapuaEntityFactory { /** * Instantiates a new {@link EndpointUsage}. * - * @param name The name to set into the {@link EndpointUsage}. + * @param name + * The name to set into the {@link EndpointUsage}. * @return The newly instantiated {@link EndpointUsage}. * @since 1.0.0 */ diff --git a/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoListResult.java b/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoListResult.java index 642f0944762..df3f7d48953 100644 --- a/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoListResult.java +++ b/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoListResult.java @@ -12,18 +12,18 @@ *******************************************************************************/ package org.eclipse.kapua.service.endpoint; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link EndpointInfo} list result definition. * * @since 1.0.0 */ @XmlRootElement(name = "endpointInfos") -@XmlType(factoryClass = EndpointInfoXmlRegistry.class, factoryMethod = "newListResult") -public interface EndpointInfoListResult extends KapuaListResult { +@XmlType +public class EndpointInfoListResult extends KapuaListResult { } diff --git a/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoXmlRegistry.java b/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoXmlRegistry.java index 334e2f8380f..b6f9cc352bb 100644 --- a/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoXmlRegistry.java +++ b/service/endpoint/api/src/main/java/org/eclipse/kapua/service/endpoint/EndpointInfoXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.endpoint; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class EndpointInfoXmlRegistry { @@ -39,15 +39,6 @@ public EndpointInfoCreator newCreator() { return endpointInfoFactory.newCreator(null); } - /** - * Creates a new {@link EndpointInfoListResult} - * - * @return - */ - public EndpointInfoListResult newListResult() { - return endpointInfoFactory.newListResult(); - } - /** * Creates a new {@link EndpointInfoQuery} * diff --git a/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoFactoryImpl.java b/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoFactoryImpl.java index 0bfdb553646..4b2d655a7b8 100644 --- a/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoFactoryImpl.java +++ b/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoFactoryImpl.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.endpoint.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.endpoint.EndpointInfo; import org.eclipse.kapua.service.endpoint.EndpointInfoCreator; import org.eclipse.kapua.service.endpoint.EndpointInfoFactory; -import org.eclipse.kapua.service.endpoint.EndpointInfoListResult; import org.eclipse.kapua.service.endpoint.EndpointInfoQuery; import org.eclipse.kapua.service.endpoint.EndpointUsage; -import javax.inject.Singleton; - /** * {@link EndpointInfoFactory} implementation. * @@ -36,11 +35,6 @@ public EndpointInfo newEntity(KapuaId scopeId) { return new EndpointInfoImpl(scopeId); } - @Override - public EndpointInfoListResult newListResult() { - return new EndpointInfoListResultImpl(); - } - @Override public EndpointInfoQuery newQuery(KapuaId scopeId) { return new EndpointInfoQueryImpl(scopeId); diff --git a/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoImplJpaRepository.java b/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoImplJpaRepository.java index 3f9034dd861..2d83e376a1e 100644 --- a/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoImplJpaRepository.java +++ b/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoImplJpaRepository.java @@ -21,7 +21,8 @@ public class EndpointInfoImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements EndpointInfoRepository { + public EndpointInfoImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(EndpointInfoImpl.class, EndpointInfo.TYPE, () -> new EndpointInfoListResultImpl(), jpaRepoConfig); + super(EndpointInfoImpl.class, EndpointInfo.TYPE, () -> new EndpointInfoListResult(), jpaRepoConfig); } } diff --git a/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoListResultImpl.java b/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoListResultImpl.java deleted file mode 100644 index 36b624f5730..00000000000 --- a/service/endpoint/internal/src/main/java/org/eclipse/kapua/service/endpoint/internal/EndpointInfoListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.endpoint.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.endpoint.EndpointInfo; -import org.eclipse.kapua.service.endpoint.EndpointInfoListResult; - -/** - * {@link EndpointInfoListResult} implementation. - * - * @since 1.0.0 - */ -public class EndpointInfoListResultImpl extends KapuaListResultImpl implements EndpointInfoListResult { - -} diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobFactory.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobFactory.java index 2019e306624..7b985707f04 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobFactory.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface JobFactory extends KapuaEntityFactory { +public interface JobFactory extends KapuaEntityFactory { } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobListResult.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobListResult.java index 8973c004e95..6b070dc7347 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobListResult.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobListResult.java @@ -23,11 +23,11 @@ * {@link JobListResult} definition. * * @since 1.0.0 - * */ @XmlRootElement(name = "jobListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = JobXmlRegistry.class, factoryMethod = "newJobListResult") -public interface JobListResult extends KapuaListResult { +@XmlType +public class JobListResult extends KapuaListResult { + private static final long serialVersionUID = -7466853155307881848L; } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobXmlRegistry.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobXmlRegistry.java index c8a7ee86d60..74abe55360f 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobXmlRegistry.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/JobXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.job; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link Job} xml factory class * @@ -44,15 +44,6 @@ public JobCreator newJobCreator() { return jobFactory.newCreator(null); } - /** - * Creates a new job list result instance - * - * @return - */ - public JobListResult newJobListResult() { - return jobFactory.newListResult(); - } - public JobQuery newQuery() { return jobFactory.newQuery(null); } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionFactory.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionFactory.java index ff4fb3d0e98..9a73594b5b1 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionFactory.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface JobExecutionFactory extends KapuaEntityFactory { +public interface JobExecutionFactory extends KapuaEntityFactory { } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionListResult.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionListResult.java index 59a93a12798..02dcea3020c 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionListResult.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionListResult.java @@ -23,11 +23,10 @@ * {@link JobExecutionListResult} definition. * * @since 1.0.0 - * */ @XmlRootElement(name = "jobExecutionListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = JobExecutionXmlRegistry.class, factoryMethod = "newJobExecutionListResult") -public interface JobExecutionListResult extends KapuaListResult { +@XmlType +public class JobExecutionListResult extends KapuaListResult { } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionXmlRegistry.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionXmlRegistry.java index b1a6903c338..0de567b3408 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionXmlRegistry.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.execution; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link JobExecution} xml factory class * @@ -44,15 +44,6 @@ public JobExecutionCreator newJobExecutionCreator() { return jobExecutionFactory.newCreator(null); } - /** - * Creates a new job list result instance - * - * @return - */ - public JobExecutionListResult newJobExecutionListResult() { - return jobExecutionFactory.newListResult(); - } - public JobExecutionQuery newQuery() { return jobExecutionFactory.newQuery(null); } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepFactory.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepFactory.java index 8509317161f..fa3b3a8bf5c 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepFactory.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepFactory.java @@ -21,14 +21,17 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface JobStepFactory extends KapuaEntityFactory { +public interface JobStepFactory extends KapuaEntityFactory { /** * Instantiates a new {@link JobStepProperty}. * - * @param name The name to set into the {@link JobStepProperty}. - * @param propertyType The type to set into the {@link JobStepProperty}. - * @param propertyValue The value to set into the {@link JobStepProperty}. + * @param name + * The name to set into the {@link JobStepProperty}. + * @param propertyType + * The type to set into the {@link JobStepProperty}. + * @param propertyValue + * The value to set into the {@link JobStepProperty}. * @return The newly instantiated {@link JobStepProperty} * @since 1.0.0 */ diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepListResult.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepListResult.java index 8b0dd67edd9..a568f646352 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepListResult.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepListResult.java @@ -23,11 +23,12 @@ * {@link JobStepListResult} definition. * * @since 1.0.0 - * */ @XmlRootElement(name = "jobStepListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = JobStepXmlRegistry.class, factoryMethod = "newJobStepListResult") -public interface JobStepListResult extends KapuaListResult { +@XmlType +public class JobStepListResult extends KapuaListResult { + + private static final long serialVersionUID = -7466853155307881848L; } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepXmlRegistry.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepXmlRegistry.java index 9cc8763ba30..13eaf71fe5c 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepXmlRegistry.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/JobStepXmlRegistry.java @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.step; +import javax.xml.bind.annotation.XmlRegistry; + import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.service.job.step.definition.JobStepProperty; -import javax.xml.bind.annotation.XmlRegistry; - /** * {@link JobStep} xml factory class * @@ -45,15 +45,6 @@ public JobStepCreator newJobStepCreator() { return jobStepFactory.newCreator(null); } - /** - * Creates a new job list result instance - * - * @return - */ - public JobStepListResult newJobStepListResult() { - return jobStepFactory.newListResult(); - } - public JobStepQuery newQuery() { return jobStepFactory.newQuery(null); } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionFactory.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionFactory.java index 7e7d0f9068f..bc1c86a7f8b 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionFactory.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionFactory.java @@ -20,15 +20,19 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface JobStepDefinitionFactory extends KapuaEntityFactory { +public interface JobStepDefinitionFactory extends KapuaEntityFactory { /** * Instantiates a new {@link JobStepProperty}. * - * @param name The name to set into the {@link JobStepProperty}. - * @param type The type to set into the {@link JobStepProperty}. - * @param value The value to set into the {@link JobStepProperty}. - * @param exampleValue The example value to set into the {@link JobStepProperty} + * @param name + * The name to set into the {@link JobStepProperty}. + * @param type + * The type to set into the {@link JobStepProperty}. + * @param value + * The value to set into the {@link JobStepProperty}. + * @param exampleValue + * The example value to set into the {@link JobStepProperty} * @return The newly instantiated {@link JobStepProperty}. * @since 1.1.0 */ @@ -37,9 +41,12 @@ public interface JobStepDefinitionFactory extends KapuaEntityFactory { +@XmlType +public class JobStepDefinitionListResult extends KapuaListResult { + + private static final long serialVersionUID = 977813250632719295L; } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionXmlRegistry.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionXmlRegistry.java index 019d7fd1776..1ec589e7d1e 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionXmlRegistry.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/step/definition/JobStepDefinitionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.step.definition; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link JobStepDefinition} xml factory class * @@ -44,15 +44,6 @@ public JobStepDefinitionCreator newJobStepDefinitionCreator() { return jobStepDefinitionFactory.newCreator(null); } - /** - * Creates a new job list result instance - * - * @return - */ - public JobStepDefinitionListResult newJobStepDefinitionListResult() { - return jobStepDefinitionFactory.newListResult(); - } - public JobStepDefinitionQuery newQuery() { return jobStepDefinitionFactory.newQuery(null); } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetFactory.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetFactory.java index 27b4e8dae25..6e6870017c1 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetFactory.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface JobTargetFactory extends KapuaEntityFactory { +public interface JobTargetFactory extends KapuaEntityFactory { } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetListResult.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetListResult.java index 3ad08fabff5..629c92c318b 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetListResult.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetListResult.java @@ -23,11 +23,10 @@ * {@link JobTargetListResult} definition. * * @since 1.0.0 - * */ @XmlRootElement(name = "jobTargetListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = JobTargetXmlRegistry.class, factoryMethod = "newJobTargetListResult") -public interface JobTargetListResult extends KapuaListResult { +@XmlType +public class JobTargetListResult extends KapuaListResult { } diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetXmlRegistry.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetXmlRegistry.java index 0e09d0c313d..8b6b8407ec1 100644 --- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetXmlRegistry.java +++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/targets/JobTargetXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.targets; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link JobTarget} xml factory class * @@ -44,15 +44,6 @@ public JobTargetCreator newJobTargetCreator() { return jobTargetFactory.newCreator(null); } - /** - * Creates a new job list result instance - * - * @return - */ - public JobTargetListResult newJobTargetListResult() { - return jobTargetFactory.newListResult(); - } - public JobTargetQuery newQuery() { return jobTargetFactory.newQuery(null); } diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionFactoryImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionFactoryImpl.java index 71fa2a9f3d0..2cb49565760 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionFactoryImpl.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.execution.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.job.execution.JobExecution; import org.eclipse.kapua.service.job.execution.JobExecutionCreator; import org.eclipse.kapua.service.job.execution.JobExecutionFactory; -import org.eclipse.kapua.service.job.execution.JobExecutionListResult; import org.eclipse.kapua.service.job.execution.JobExecutionQuery; -import javax.inject.Singleton; - /** * {@link JobExecutionFactory} implementation. * @@ -45,11 +44,6 @@ public JobExecutionQuery newQuery(KapuaId scopeId) { return new JobExecutionQueryImpl(scopeId); } - @Override - public JobExecutionListResult newListResult() { - return new JobExecutionListResultImpl(); - } - @Override public JobExecution clone(JobExecution jobExecution) { try { diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionImplJpaRepository.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionImplJpaRepository.java index c4224d0d2bd..848c4e5e520 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionImplJpaRepository.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionImplJpaRepository.java @@ -25,8 +25,9 @@ public class JobExecutionImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements JobExecutionRepository { + public JobExecutionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobExecutionImpl.class, JobExecution.TYPE, () -> new JobExecutionListResultImpl(), jpaRepoConfig); + super(JobExecutionImpl.class, JobExecution.TYPE, () -> new JobExecutionListResult(), jpaRepoConfig); } @Override diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionListResultImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionListResultImpl.java deleted file mode 100644 index f0d37bcad5f..00000000000 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/execution/internal/JobExecutionListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.job.execution.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.job.execution.JobExecution; -import org.eclipse.kapua.service.job.execution.JobExecutionListResult; - -/** - * {@link JobExecutionListResult} implementation. - * - * @since 1.0.0 - */ -public class JobExecutionListResultImpl extends KapuaListResultImpl implements JobExecutionListResult { - -} diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobFactoryImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobFactoryImpl.java index 9f5c0ade8e5..95a580e025c 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobFactoryImpl.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.job.Job; import org.eclipse.kapua.service.job.JobCreator; import org.eclipse.kapua.service.job.JobFactory; -import org.eclipse.kapua.service.job.JobListResult; import org.eclipse.kapua.service.job.JobQuery; -import javax.inject.Singleton; - /** * {@link JobFactory} implementation. * @@ -45,11 +44,6 @@ public JobQuery newQuery(KapuaId scopeId) { return new JobQueryImpl(scopeId); } - @Override - public JobListResult newListResult() { - return new JobListResultImpl(); - } - @Override public Job clone(Job job) { try { diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobImplJpaRepository.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobImplJpaRepository.java index 14fcb9432b3..b4f61507844 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobImplJpaRepository.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobImplJpaRepository.java @@ -23,6 +23,6 @@ public class JobImplJpaRepository implements JobRepository { public JobImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobImpl.class, Job.TYPE, () -> new JobListResultImpl(), jpaRepoConfig); + super(JobImpl.class, Job.TYPE, () -> new JobListResult(), jpaRepoConfig); } } diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobListResultImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobListResultImpl.java deleted file mode 100644 index 20e01878c1f..00000000000 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.job.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.job.Job; -import org.eclipse.kapua.service.job.JobListResult; - -/** - * {@link JobListResult} implementation. - * - * @since 1.0.0 - */ -public class JobListResultImpl extends KapuaListResultImpl implements JobListResult { - - private static final long serialVersionUID = -7466853155307881848L; - -} diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionFactoryImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionFactoryImpl.java index 6363e60b085..120038b64ca 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionFactoryImpl.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionFactoryImpl.java @@ -19,7 +19,6 @@ import org.eclipse.kapua.service.job.step.definition.JobStepDefinition; import org.eclipse.kapua.service.job.step.definition.JobStepDefinitionCreator; import org.eclipse.kapua.service.job.step.definition.JobStepDefinitionFactory; -import org.eclipse.kapua.service.job.step.definition.JobStepDefinitionListResult; import org.eclipse.kapua.service.job.step.definition.JobStepDefinitionQuery; import org.eclipse.kapua.service.job.step.definition.JobStepProperty; @@ -46,11 +45,6 @@ public JobStepDefinitionQuery newQuery(KapuaId scopeId) { return new JobStepDefinitionQueryImpl(scopeId); } - @Override - public JobStepDefinitionListResult newListResult() { - return new JobStepDefinitionListResultImpl(); - } - @Override public JobStepProperty newStepProperty(String name, String type, String value) { return new JobStepPropertyImpl(name, type, value, null); diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionImplJpaRepository.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionImplJpaRepository.java index 484085a0538..9614d08874e 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionImplJpaRepository.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionImplJpaRepository.java @@ -23,7 +23,7 @@ public class JobStepDefinitionImplJpaRepository implements JobStepDefinitionRepository { public JobStepDefinitionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobStepDefinitionImpl.class, JobStepDefinition.TYPE, () -> new JobStepDefinitionListResultImpl(), jpaRepoConfig); + super(JobStepDefinitionImpl.class, JobStepDefinition.TYPE, () -> new JobStepDefinitionListResult(), jpaRepoConfig); } } diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionListResultImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionListResultImpl.java deleted file mode 100644 index d829517d144..00000000000 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/definition/internal/JobStepDefinitionListResultImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.job.step.definition.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.job.step.definition.JobStepDefinition; -import org.eclipse.kapua.service.job.step.definition.JobStepDefinitionListResult; - -/** - * {@link JobStepDefinitionListResult} definition. - * - * @since 1.0.0 - * - */ -public class JobStepDefinitionListResultImpl extends KapuaListResultImpl implements JobStepDefinitionListResult { - - private static final long serialVersionUID = 977813250632719295L; - -} diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepFactoryImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepFactoryImpl.java index acab84ae774..ad8f9356333 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepFactoryImpl.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepFactoryImpl.java @@ -18,7 +18,6 @@ import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.job.step.JobStepCreator; import org.eclipse.kapua.service.job.step.JobStepFactory; -import org.eclipse.kapua.service.job.step.JobStepListResult; import org.eclipse.kapua.service.job.step.JobStepQuery; import org.eclipse.kapua.service.job.step.definition.JobStepProperty; import org.eclipse.kapua.service.job.step.definition.internal.JobStepPropertyImpl; @@ -46,11 +45,6 @@ public JobStepQuery newQuery(KapuaId scopeId) { return new JobStepQueryImpl(scopeId); } - @Override - public JobStepListResult newListResult() { - return new JobStepListResultImpl(); - } - @Override public JobStepProperty newStepProperty(String name, String propertyType, String propertyValue) { return new JobStepPropertyImpl(name, propertyType, propertyValue, null); diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepImplJpaRepository.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepImplJpaRepository.java index a92003a6358..c0c9201c1cf 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepImplJpaRepository.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepImplJpaRepository.java @@ -26,8 +26,9 @@ public class JobStepImplJpaRepository extends KapuaNamedEntityJpaRepository implements JobStepRepository { + public JobStepImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobStepImpl.class, JobStep.TYPE, () -> new JobStepListResultImpl(), jpaRepoConfig); + super(JobStepImpl.class, JobStep.TYPE, () -> new JobStepListResult(), jpaRepoConfig); } @Override diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepListResultImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepListResultImpl.java deleted file mode 100644 index 4ce385b5462..00000000000 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.job.step.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.job.step.JobStep; -import org.eclipse.kapua.service.job.step.JobStepListResult; - -/** - * {@link JobStepListResult} implementation. - * - * @since 1.0.0 - */ -public class JobStepListResultImpl extends KapuaListResultImpl implements JobStepListResult { - - private static final long serialVersionUID = -7466853155307881848L; - -} diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetFactoryImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetFactoryImpl.java index f7827b78da1..cfd25291c12 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetFactoryImpl.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.targets.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.job.targets.JobTarget; import org.eclipse.kapua.service.job.targets.JobTargetCreator; import org.eclipse.kapua.service.job.targets.JobTargetFactory; -import org.eclipse.kapua.service.job.targets.JobTargetListResult; import org.eclipse.kapua.service.job.targets.JobTargetQuery; -import javax.inject.Singleton; - /** * {@link JobTargetFactory} implementation. * @@ -45,11 +44,6 @@ public JobTargetQuery newQuery(KapuaId scopeId) { return new JobTargetQueryImpl(scopeId); } - @Override - public JobTargetListResult newListResult() { - return new JobTargetListResultImpl(); - } - @Override public JobTarget clone(JobTarget jobTarget) { try { diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetImplJpaRepository.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetImplJpaRepository.java index 3cee4ad8f3a..d91afb19d0e 100644 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetImplJpaRepository.java +++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetImplJpaRepository.java @@ -23,7 +23,7 @@ public class JobTargetImplJpaRepository implements JobTargetRepository { public JobTargetImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(JobTargetImpl.class, JobTarget.TYPE, () -> new JobTargetListResultImpl(), jpaRepoConfig); + super(JobTargetImpl.class, JobTarget.TYPE, () -> new JobTargetListResult(), jpaRepoConfig); } } diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetListResultImpl.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetListResultImpl.java deleted file mode 100644 index 8c3f98a494c..00000000000 --- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/targets/internal/JobTargetListResultImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.job.targets.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.job.targets.JobTarget; -import org.eclipse.kapua.service.job.targets.JobTargetListResult; - -/** - * {@link JobTargetListResult} implementation. - * - * @since 1.0.0 - */ -public class JobTargetListResultImpl extends KapuaListResultImpl implements JobTargetListResult { - -} diff --git a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobExecutionServiceSteps.java b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobExecutionServiceSteps.java index acb57217905..8315e9a5d02 100644 --- a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobExecutionServiceSteps.java +++ b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobExecutionServiceSteps.java @@ -14,16 +14,9 @@ import java.util.Calendar; import java.util.Date; + import javax.inject.Inject; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.model.id.KapuaId; @@ -47,6 +40,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; + @Singleton public class JobExecutionServiceSteps extends JobServiceTestBase { @@ -149,7 +152,8 @@ public void deleteLastJobExecution() throws Exception { /** * Checks that the last {@link Job} in context has the given number of {@link JobExecution}s * - * @param expectedNumberOfExecution Expected number of {@link JobExecution}s + * @param expectedNumberOfExecution + * Expected number of {@link JobExecution}s * @throws Exception * @since 2.1.0 */ @@ -163,8 +167,10 @@ public void checkJobInContextHasExecution(int expectedNumberOfExecution) throws /** * Looks for a {@link Job} by its {@link Job#getName()} and checks that has the given number of {@link JobExecution}s * - * @param jobName The {@link Job#getName()} to look for - * @param expectedNumberOfExecution Expected number of {@link JobExecution}s + * @param jobName + * The {@link Job#getName()} to look for + * @param expectedNumberOfExecution + * Expected number of {@link JobExecution}s * @throws Exception * @since 2.1.0 */ @@ -178,8 +184,10 @@ public void checkJobByNameHasExecution(String jobName, int expectedNumberOfExecu /** * Checks that the given {@link Job} has the given number of {@link JobExecution}s * - * @param job The {@link Job} to check - * @param expectedNumberOfExecution Expected number of {@link JobExecution}s + * @param job + * The {@link Job} to check + * @param expectedNumberOfExecution + * Expected number of {@link JobExecution}s * @throws Exception * @since 2.1.0 */ @@ -213,21 +221,18 @@ public void queryExecutionsForJobWithPackages() throws Exception { } } - @Then("I query for the execution items for the current job starting from date in the future") public void queryExecutionsForJobWithStartDateInFuture() throws Exception { final Date startDate = createDateInFuture(); queryExecutionsForJobWithStartDate(startDate); } - @Then("I query for the execution items for the current job starting from date in the past") public void queryExecutionsForJobWithStartDateInPast() throws Exception { final Date startDate = createDateInPast(); queryExecutionsForJobWithStartDate(startDate); } - private void queryExecutionsForJobWithStartDate(Date startDate) throws Exception { final Job job = (Job) stepData.get("Job"); final JobExecutionQuery tmpQuery = jobExecutionFactory.newQuery(getCurrentScopeId()); @@ -245,14 +250,12 @@ private void queryExecutionsForJobWithStartDate(Date startDate) throws Exception } } - private Date createDateInFuture() { final Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_MONTH, 7); return calendar.getTime(); } - private Date createDateInPast() { final Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_MONTH, -7); @@ -419,7 +422,6 @@ private void logJobInfo(JobExecutionListResult jobExecutionList, Job job, int ex } } - @Then("The job execution matches the creator") public void checkJobExecutionItemAgainstCreator() { JobExecutionCreator executionCreator = (JobExecutionCreator) stepData.get("JobExecutionCreator"); @@ -448,7 +450,6 @@ public void checkThatNoExecutionWasFound() { public void testTheJobExecutionFactory() { Assert.assertNotNull(jobExecutionFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull(jobExecutionFactory.newEntity(SYS_SCOPE_ID)); - Assert.assertNotNull(jobExecutionFactory.newListResult()); Assert.assertNotNull(jobExecutionFactory.newQuery(SYS_SCOPE_ID)); } // Private methods diff --git a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobServiceSteps.java b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobServiceSteps.java index c46794eefcd..71e02233eaa 100644 --- a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobServiceSteps.java +++ b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobServiceSteps.java @@ -13,14 +13,12 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.steps; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.model.id.KapuaId; @@ -37,10 +35,15 @@ import org.eclipse.kapua.service.job.step.JobStep; import org.junit.Assert; -import javax.inject.Inject; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; @Singleton public class JobServiceSteps extends JobServiceTestBase { @@ -339,7 +342,6 @@ public void testJobFactorySanity() { Assert.assertNotNull("The job factory returned a null creator!", jobFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull("The job factory returned a null job object!", jobFactory.newEntity(SYS_SCOPE_ID)); Assert.assertNotNull("The job factory returned a null job query!", jobFactory.newQuery(SYS_SCOPE_ID)); - Assert.assertNotNull("The job factory returned a null job list result!", jobFactory.newListResult()); } @Then("I find a job with name {string}") @@ -374,7 +376,6 @@ public void iTryToEditJobToName(String jobName) throws Throwable { } } - @When("I query for the job with the name {string} and I find it") public void iQueryForTheJobWithTheNameAndIFoundIt(String jobName) throws Exception { JobQuery tmpQuery = jobFactory.newQuery(getCurrentScopeId()); diff --git a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepDefinitionServiceSteps.java b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepDefinitionServiceSteps.java index a8952780e54..96a18e4f432 100644 --- a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepDefinitionServiceSteps.java +++ b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepDefinitionServiceSteps.java @@ -12,14 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.steps; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.model.id.KapuaId; @@ -34,9 +31,15 @@ import org.eclipse.kapua.service.job.steps.model.TestJobStepProcessor; import org.junit.Assert; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.List; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; @Singleton public class JobStepDefinitionServiceSteps extends JobServiceTestBase { @@ -324,12 +327,10 @@ public void checkStepDefinitionProcessorName(String name) { public void testTheStepDefinitionFactory() { Assert.assertNotNull(jobStepDefinitionFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull(jobStepDefinitionFactory.newEntity(SYS_SCOPE_ID)); - Assert.assertNotNull(jobStepDefinitionFactory.newListResult()); Assert.assertNotNull(jobStepDefinitionFactory.newQuery(SYS_SCOPE_ID)); Assert.assertNotNull(jobStepDefinitionFactory.newStepProperty("TestName", "TestType", "TestValue", "TestExampleValue")); } - private JobStepType getTypeFromString(String type) { if (type.trim().toUpperCase().equals("TARGET")) { return JobStepType.TARGET; diff --git a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepServiceSteps.java b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepServiceSteps.java index b2f2f218968..219e528ffef 100644 --- a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepServiceSteps.java +++ b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobStepServiceSteps.java @@ -12,14 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.steps; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import javax.inject.Inject; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.model.id.KapuaId; @@ -40,12 +40,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; @Singleton public class JobStepServiceSteps extends JobServiceTestBase { @@ -106,13 +109,15 @@ public void iPrepareAJobStepCreatorWithPropertyList(String name, List cucJobStepProperties) throws Exception{ + public void iAddJobStepToJobWithSelectedJobStepDefinitionAndFollowingJobStepProperties(String jobStepName, List cucJobStepProperties) throws Exception { Job job = (Job) stepData.get(JOB); JobStepDefinition jobStepDefinition = (JobStepDefinition) stepData.get(JOB_STEP_DEFINITION); @@ -123,11 +128,11 @@ public void iAddJobStepToJobWithSelectedJobStepDefinitionAndFollowingJobStepProp jobStepCreator.setStepProperties( cucJobStepProperties.stream() .map( - (cucJobStepProperty) -> jobStepFactory.newStepProperty( - cucJobStepProperty.getName(), - cucJobStepProperty.getType(), - cucJobStepProperty.getValue() - ) + (cucJobStepProperty) -> jobStepFactory.newStepProperty( + cucJobStepProperty.getName(), + cucJobStepProperty.getType(), + cucJobStepProperty.getValue() + ) ) .collect(Collectors.toList()) ); @@ -375,7 +380,6 @@ public void checkJobStepNotFound() { public void testTheStepFactory() { Assert.assertNotNull(jobStepFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull(jobStepFactory.newEntity(SYS_SCOPE_ID)); - Assert.assertNotNull(jobStepFactory.newListResult()); Assert.assertNotNull(jobStepFactory.newQuery(SYS_SCOPE_ID)); Assert.assertNotNull(jobStepFactory.newStepProperty("TestName", "TestType", "TestValue")); } diff --git a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobTargetServiceSteps.java b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobTargetServiceSteps.java index ea7e630c583..5f3a7f60349 100644 --- a/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobTargetServiceSteps.java +++ b/service/job/test-steps/src/main/java/org/eclipse/kapua/service/job/steps/JobTargetServiceSteps.java @@ -12,14 +12,12 @@ *******************************************************************************/ package org.eclipse.kapua.service.job.steps; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import javax.inject.Inject; + import org.eclipse.kapua.KapuaEntityNotFoundException; import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.locator.KapuaLocator; @@ -46,10 +44,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; @Singleton public class JobTargetServiceSteps extends JobServiceTestBase { @@ -77,7 +80,7 @@ public void beforeScenarioNone(Scenario scenario) { public void setServices() { KapuaLocator locator = KapuaLocator.getInstance(); - deviceFactory= locator.getFactory(DeviceFactory.class); + deviceFactory = locator.getFactory(DeviceFactory.class); deviceRegistryService = locator.getService(DeviceRegistryService.class); jobTargetService = locator.getService(JobTargetService.class); @@ -126,7 +129,6 @@ public void iCreateANewJobTargetItem() throws Exception { } } - @And("I confirm the step index is different than {int} and status is {string}") public void iConfirmTheStepIndexIsDifferentThanAndStatusIs(int stepIndex, String status) { JobTarget jobTarget = (JobTarget) stepData.get(JOB_TARGET); @@ -134,7 +136,6 @@ public void iConfirmTheStepIndexIsDifferentThanAndStatusIs(int stepIndex, String Assert.assertEquals(status, jobTarget.getStatus().toString()); } - @And("I search for the job targets in database") public void iSearchForTheJobTargetsInDatabase() { ArrayList jobTargets = (ArrayList) stepData.get(JOB_TARGET_LIST); @@ -144,7 +145,8 @@ public void iSearchForTheJobTargetsInDatabase() { /** * Adds {@link Device}s with the given {@link Device#getClientId()}s as a {@link JobTarget} of the {@link Job} in context. * - * @param clientIds The {@link Device#getClientId()}s to add + * @param clientIds + * The {@link Device#getClientId()}s to add * @throws Exception * @since 2.1.0 */ @@ -367,23 +369,22 @@ public void checkThatNoTargetWasFound() { Assert.assertNull("Unexpected job target item found!", stepData.get(JOB_TARGET)); } - @When("I test the sanity of the job target factory") public void testTheJobTargetFactory() { Assert.assertNotNull(jobTargetFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull(jobTargetFactory.newEntity(SYS_SCOPE_ID)); - Assert.assertNotNull(jobTargetFactory.newListResult()); Assert.assertNotNull(jobTargetFactory.newQuery(SYS_SCOPE_ID)); } - // Check Job Targets /** * Checks that the {@link JobTarget} in context for the {@link Job} in context has the expected {@link JobTarget#getStepIndex()} and {@link JobTarget#getStatus()} * - * @param expectedStepIndex The expected {@link JobTarget#getStepIndex()} - * @param expectedJobTargetStatus The expected {@link JobTarget#getStatus()} + * @param expectedStepIndex + * The expected {@link JobTarget#getStepIndex()} + * @param expectedJobTargetStatus + * The expected {@link JobTarget#getStatus()} * @throws Exception * @since 2.1.0 */ @@ -396,11 +397,15 @@ public void checkJobTargetForJobInContextHas(int expectedStepIndex, String expec } /** - * Checks that the {@link JobTarget} that matches the {@link Device} with the given {@link Device#getClientId()} for the {@link Job} in context has the expected {@link JobTarget#getStepIndex()} and {@link JobTarget#getStatus()} + * Checks that the {@link JobTarget} that matches the {@link Device} with the given {@link Device#getClientId()} for the {@link Job} in context has the expected {@link JobTarget#getStepIndex()} + * and {@link JobTarget#getStatus()} * - * @param clientId The {@link Device#getClientId()} to look for - * @param expectedStepIndex The expected {@link JobTarget#getStepIndex()} - * @param expectedJobTargetStatus The expected {@link JobTarget#getStatus()} + * @param clientId + * The {@link Device#getClientId()} to look for + * @param expectedStepIndex + * The expected {@link JobTarget#getStepIndex()} + * @param expectedJobTargetStatus + * The expected {@link JobTarget#getStatus()} * @throws Exception * @since 2.1.0 */ @@ -416,10 +421,10 @@ public void checkJobTargetByNameForJobHas(String clientId, int expectedStepIndex JobTargetQuery jobTargetQuery = jobTargetFactory.newQuery(job.getScopeId()); jobTargetQuery.setPredicate( - jobTargetQuery.andPredicate( - jobTargetQuery.attributePredicate(JobTargetAttributes.JOB_ID, job.getId()), - jobTargetQuery.attributePredicate(JobTargetAttributes.JOB_TARGET_ID, device.getId()) - ) + jobTargetQuery.andPredicate( + jobTargetQuery.attributePredicate(JobTargetAttributes.JOB_ID, job.getId()), + jobTargetQuery.attributePredicate(JobTargetAttributes.JOB_TARGET_ID, device.getId()) + ) ); JobTarget jobTarget = jobTargetService.query(jobTargetQuery).getFirstItem(); @@ -434,8 +439,10 @@ public void checkJobTargetByNameForJobHas(String clientId, int expectedStepIndex /** * Checks that given {@link JobTarget} has the expected {@link JobTarget#getStepIndex()} and {@link JobTarget#getStatus()} * - * @param expectedStepIndex The expected {@link JobTarget#getStepIndex()} - * @param expectedJobTargetStatus The expected {@link JobTarget#getStatus()} + * @param expectedStepIndex + * The expected {@link JobTarget#getStepIndex()} + * @param expectedJobTargetStatus + * The expected {@link JobTarget#getStatus()} * @throws Exception * @since 2.1.0 */ @@ -470,13 +477,13 @@ private JobTargetCreator prepareDefaultJobTargetCreator() { private JobTargetStatus parseJobTargetStatusFromString(String stat) { switch (stat.toUpperCase().trim()) { - case "PROCESS_AWAITING": - return JobTargetStatus.PROCESS_AWAITING; - case "PROCESS_OK": - return JobTargetStatus.PROCESS_OK; - case "PROCESS_FAILED": - default: - return JobTargetStatus.PROCESS_FAILED; + case "PROCESS_AWAITING": + return JobTargetStatus.PROCESS_AWAITING; + case "PROCESS_OK": + return JobTargetStatus.PROCESS_OK; + case "PROCESS_FAILED": + default: + return JobTargetStatus.PROCESS_FAILED; } } } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerFactory.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerFactory.java index cbf4d65b3af..728fa9a8813 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerFactory.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerFactory.java @@ -21,14 +21,17 @@ * @see KapuaEntityFactory * @since 1.0.0 */ -public interface TriggerFactory extends KapuaEntityFactory { +public interface TriggerFactory extends KapuaEntityFactory { /** * Instantiates a new {@link TriggerProperty} * - * @param name The name to set into the {@link TriggerProperty}. - * @param type The type to set into the {@link TriggerProperty}. - * @param value The value to set into the {@link TriggerProperty}. + * @param name + * The name to set into the {@link TriggerProperty}. + * @param type + * The type to set into the {@link TriggerProperty}. + * @param value + * The value to set into the {@link TriggerProperty}. * @return The newly instatiated {@link TriggerProperty}. * @since 1.0.0 */ diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerListResult.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerListResult.java index 13d9269bb76..b66c2033051 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerListResult.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link Trigger} {@link KapuaListResult} definition. * @@ -27,6 +27,9 @@ */ @XmlRootElement(name = "scheduleListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = TriggerXmlRegistry.class, factoryMethod = "newListResult") -public interface TriggerListResult extends KapuaListResult { +@XmlType +public class TriggerListResult extends KapuaListResult { + + private static final long serialVersionUID = -5118004898345748297L; + } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerXmlRegistry.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerXmlRegistry.java index 60814fad7e5..93f2523a11e 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerXmlRegistry.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/TriggerXmlRegistry.java @@ -12,11 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger; +import javax.xml.bind.annotation.XmlRegistry; + import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerProperty; -import javax.xml.bind.annotation.XmlRegistry; - /** * {@link Trigger} xml factory class * @@ -35,10 +35,6 @@ public TriggerCreator newCreator() { return triggerFactory.newCreator(null); } - public TriggerListResult newListResult() { - return triggerFactory.newListResult(); - } - public TriggerQuery newQuery() { return triggerFactory.newQuery(null); } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionFactory.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionFactory.java index fac9db3f880..c8f10f4663f 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionFactory.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionFactory.java @@ -20,14 +20,17 @@ * @see KapuaEntityFactory * @since 1.1.0 */ -public interface TriggerDefinitionFactory extends KapuaEntityFactory { +public interface TriggerDefinitionFactory extends KapuaEntityFactory { /** * Instantiates a new {@link TriggerProperty}. * - * @param name The name to set into the {@link TriggerProperty}. - * @param type The type to set into the {@link TriggerProperty}. - * @param value The value to set into the {@link TriggerProperty}. + * @param name + * The name to set into the {@link TriggerProperty}. + * @param type + * The type to set into the {@link TriggerProperty}. + * @param value + * The value to set into the {@link TriggerProperty}. * @return The newly instantiated {@link TriggerProperty}. * @since 1.1.0 */ diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionListResult.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionListResult.java index 82e707bc26b..b7aa84a052f 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionListResult.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.definition; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link TriggerDefinition} {@link KapuaListResult} definition. * @@ -27,7 +27,9 @@ */ @XmlRootElement(name = "triggerDefinitionListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = TriggerDefinitionXmlRegistry.class, factoryMethod = "newListResult") -public interface TriggerDefinitionListResult extends KapuaListResult { +@XmlType +public class TriggerDefinitionListResult extends KapuaListResult { + + private static final long serialVersionUID = 977813250632719295L; } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionXmlRegistry.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionXmlRegistry.java index 6303d16a524..24994cfc93b 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionXmlRegistry.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/TriggerDefinitionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.definition; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link TriggerDefinition} xml factory class * @@ -34,10 +34,6 @@ public TriggerDefinitionCreator newCreator() { return triggerDefinitionFactory.newCreator(null); } - public TriggerDefinitionListResult newListResult() { - return triggerDefinitionFactory.newListResult(); - } - public TriggerDefinitionQuery newQuery() { return triggerDefinitionFactory.newQuery(null); } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerFactory.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerFactory.java index 01a68558f16..a666528f17e 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerFactory.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerFactory.java @@ -20,5 +20,6 @@ * @see KapuaEntityFactory * @since 1.5.0 */ -public interface FiredTriggerFactory extends KapuaEntityFactory { +public interface FiredTriggerFactory extends KapuaEntityFactory { + } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerListResult.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerListResult.java index 4f0a10bbfe0..e58137f685b 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerListResult.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.fired; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link FiredTrigger} {@link KapuaListResult} definition. * @@ -26,7 +26,7 @@ */ @XmlRootElement(name = "firedTriggerListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = FiredTriggerXmlRegistry.class, factoryMethod = "newListResult") -public interface FiredTriggerListResult extends KapuaListResult { +@XmlType +public class FiredTriggerListResult extends KapuaListResult { } diff --git a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerXmlRegistry.java b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerXmlRegistry.java index a7f6222ca4c..eea6c01f05f 100644 --- a/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerXmlRegistry.java +++ b/service/scheduler/api/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/FiredTriggerXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.fired; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link FiredTrigger} xml factory class. * @@ -34,10 +34,6 @@ public FiredTriggerCreator newCreator() { return firedTriggerFactory.newCreator(null); } - public FiredTriggerListResult newListResult() { - return firedTriggerFactory.newListResult(); - } - public FiredTriggerQuery newQuery() { return firedTriggerFactory.newQuery(null); } diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionFactoryImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionFactoryImpl.java index f69c6742196..4e85f48cbe6 100644 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionFactoryImpl.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionFactoryImpl.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.definition.quartz; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinition; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinitionCreator; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinitionFactory; -import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinitionListResult; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinitionQuery; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerProperty; -import javax.inject.Singleton; - /** * {@link TriggerDefinitionFactory} implementation. * @@ -46,11 +45,6 @@ public TriggerDefinitionQuery newQuery(KapuaId scopeId) { return new TriggerDefinitionQueryImpl(scopeId); } - @Override - public TriggerDefinitionListResult newListResult() { - return new TriggerDefinitionListResultImpl(); - } - @Override public TriggerProperty newTriggerProperty(String name, String type, String value) { return new TriggerPropertyImpl(name, type, value); diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionImplJpaRepository.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionImplJpaRepository.java index 5d1ab2ce348..224fc38e96e 100644 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionImplJpaRepository.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionImplJpaRepository.java @@ -21,7 +21,8 @@ public class TriggerDefinitionImplJpaRepository extends KapuaNamedEntityJpaRepository implements TriggerDefinitionRepository { + public TriggerDefinitionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(TriggerDefinitionImpl.class, TriggerDefinition.TYPE, () -> new TriggerDefinitionListResultImpl(), jpaRepoConfig); + super(TriggerDefinitionImpl.class, TriggerDefinition.TYPE, () -> new TriggerDefinitionListResult(), jpaRepoConfig); } } diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionListResultImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionListResultImpl.java deleted file mode 100644 index 978cd775cc6..00000000000 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.scheduler.trigger.definition.quartz; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinition; -import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerDefinitionListResult; - -/** - * {@link TriggerDefinitionListResult} definition. - * - * @since 1.1.0 - */ -public class TriggerDefinitionListResultImpl extends KapuaListResultImpl implements TriggerDefinitionListResult { - - private static final long serialVersionUID = 977813250632719295L; - -} diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerFactoryImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerFactoryImpl.java index 991f69b1603..74812094769 100644 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerFactoryImpl.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.fired.quartz; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTrigger; import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTriggerCreator; import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTriggerFactory; -import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTriggerListResult; import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTriggerQuery; -import javax.inject.Singleton; - /** * {@link FiredTriggerFactory} implementation. * @@ -45,11 +44,6 @@ public FiredTriggerQuery newQuery(KapuaId scopeId) { return new FiredTriggerQueryImpl(scopeId); } - @Override - public FiredTriggerListResult newListResult() { - return new FiredTriggerListResultImpl(); - } - @Override public FiredTrigger clone(FiredTrigger firedTrigger) { try { diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerImplJpaRepository.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerImplJpaRepository.java index 99f95315d1a..39af73e1fff 100644 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerImplJpaRepository.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerImplJpaRepository.java @@ -21,8 +21,9 @@ public class FiredTriggerImplJpaRepository extends KapuaEntityJpaRepository implements FiredTriggerRepository { + public FiredTriggerImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(FiredTriggerImpl.class, FiredTrigger.TYPE, () -> new FiredTriggerListResultImpl(), configuration); + super(FiredTriggerImpl.class, FiredTrigger.TYPE, () -> new FiredTriggerListResult(), configuration); } } diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerListResultImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerListResultImpl.java deleted file mode 100644 index 7f0a93c0f41..00000000000 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/fired/quartz/FiredTriggerListResultImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.scheduler.trigger.fired.quartz; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTrigger; -import org.eclipse.kapua.service.scheduler.trigger.fired.FiredTriggerListResult; - -/** - * {@link FiredTriggerListResult} implementation. - * - * @since 1.5.0 - */ -public class FiredTriggerListResultImpl extends KapuaListResultImpl implements FiredTriggerListResult { -} diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerFactoryImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerFactoryImpl.java index 2b924c6e397..399b2f141f8 100644 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerFactoryImpl.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerFactoryImpl.java @@ -12,18 +12,17 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.quartz; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.scheduler.trigger.Trigger; import org.eclipse.kapua.service.scheduler.trigger.TriggerCreator; import org.eclipse.kapua.service.scheduler.trigger.TriggerFactory; -import org.eclipse.kapua.service.scheduler.trigger.TriggerListResult; import org.eclipse.kapua.service.scheduler.trigger.TriggerQuery; import org.eclipse.kapua.service.scheduler.trigger.definition.TriggerProperty; import org.eclipse.kapua.service.scheduler.trigger.definition.quartz.TriggerPropertyImpl; -import javax.inject.Singleton; - /** * {@link TriggerFactory} implementation. * @@ -47,11 +46,6 @@ public TriggerQuery newQuery(KapuaId scopeId) { return new TriggerQueryImpl(scopeId); } - @Override - public TriggerListResult newListResult() { - return new TriggerListResultImpl(); - } - @Override public TriggerProperty newTriggerProperty(String name, String type, String value) { return new TriggerPropertyImpl(name, type, value); diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerImplJpaRepository.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerImplJpaRepository.java index 5e4e056cc2f..d95e4f48a88 100644 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerImplJpaRepository.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerImplJpaRepository.java @@ -12,6 +12,12 @@ *******************************************************************************/ package org.eclipse.kapua.service.scheduler.trigger.quartz; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaDelete; +import javax.persistence.criteria.JoinType; +import javax.persistence.criteria.ListJoin; +import javax.persistence.criteria.Root; + import org.eclipse.kapua.commons.jpa.JpaAwareTxContext; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaNamedEntityJpaRepository; @@ -24,18 +30,12 @@ import org.eclipse.kapua.service.scheduler.trigger.definition.quartz.TriggerPropertyImpl_; import org.eclipse.kapua.storage.TxContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Root; - public class TriggerImplJpaRepository extends KapuaNamedEntityJpaRepository implements TriggerRepository { public TriggerImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(TriggerImpl.class, Trigger.TYPE, () -> new TriggerListResultImpl(), jpaRepoConfig); + super(TriggerImpl.class, Trigger.TYPE, () -> new TriggerListResult(), jpaRepoConfig); } @Override diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerListResultImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerListResultImpl.java deleted file mode 100644 index 5004338a596..00000000000 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.scheduler.trigger.quartz; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.scheduler.trigger.Trigger; -import org.eclipse.kapua.service.scheduler.trigger.TriggerListResult; - -/** - * {@link TriggerListResult} implementation. - * - * @since 1.0.0 - */ -public class TriggerListResultImpl extends KapuaListResultImpl implements TriggerListResult { - - private static final long serialVersionUID = -5118004898345748297L; -} diff --git a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java index 5dbd613e106..74920b767bd 100755 --- a/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java +++ b/service/scheduler/quartz/src/main/java/org/eclipse/kapua/service/scheduler/trigger/quartz/TriggerServiceImpl.java @@ -19,6 +19,7 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; + import javax.inject.Singleton; import javax.validation.constraints.NotNull; @@ -122,7 +123,8 @@ public Trigger create(TriggerCreator triggerCreator) throws KapuaException { TriggerDefinition triggerDefinition = triggerDefinitionRepository.find(tx, KapuaId.ANY, triggerCreator.getTriggerDefinitionId()) .orElseThrow(() -> new KapuaEntityNotFoundException(TriggerDefinition.TYPE, triggerCreator.getTriggerDefinitionId())); - final Map triggerDefinitionPropertiesByName = triggerDefinition.getTriggerProperties().stream().collect(Collectors.toMap(jsdp -> jsdp.getName(), Function.identity())); + final Map triggerDefinitionPropertiesByName = triggerDefinition.getTriggerProperties().stream() + .collect(Collectors.toMap(jsdp -> jsdp.getName(), Function.identity())); for (TriggerProperty jsp : triggerCreator.getTriggerProperties()) { final TriggerProperty jsdp = triggerDefinitionPropertiesByName.get(jsp.getName()); if (jsdp == null) { @@ -312,7 +314,7 @@ public TriggerListResult query(KapuaQuery query) throws KapuaException { return txManager.execute(tx -> { // Do query TriggerListResult triggers = triggerRepository.query(tx, query); - final TriggerListResult res = triggerFactory.newListResult(); + final TriggerListResult res = new TriggerListResult(); for (Trigger trigger : triggers.getItems()) { res.addItem(adaptTrigger(tx, trigger)); } @@ -349,7 +351,8 @@ public long count(KapuaQuery query) throws KapuaException { * Gets the {@link TriggerDefinition} named 'Interval Job' * * @return he {@link TriggerDefinition} named 'Interval Job' - * @throws KapuaException In case is not found. + * @throws KapuaException + * In case is not found. * @since 1.1.0 */ private synchronized TriggerDefinition getIntervalJobTriggerDefinition() throws KapuaException { @@ -364,7 +367,8 @@ private synchronized TriggerDefinition getIntervalJobTriggerDefinition() throws * Gets the {@link TriggerDefinition} named 'Cron Job' * * @return he {@link TriggerDefinition} named 'Cron Job' - * @throws KapuaException In case is not found. + * @throws KapuaException + * In case is not found. * @since 1.1.0 */ private synchronized TriggerDefinition getCronJobTriggerDefinition() throws KapuaException { @@ -378,9 +382,11 @@ private synchronized TriggerDefinition getCronJobTriggerDefinition() throws Kapu /** * Gets the {@link TriggerDefinition} by the given name. * - * @param triggerDefinitionName The {@link TriggerDefinition#getName()} to look for. + * @param triggerDefinitionName + * The {@link TriggerDefinition#getName()} to look for. * @return The {@link TriggerDefinition} by the given name. - * @throws KapuaException In case nothing is found. + * @throws KapuaException + * In case nothing is found. * @since 1.1.0 */ private synchronized TriggerDefinition getTriggerDefinition(String triggerDefinitionName) throws KapuaException { @@ -390,11 +396,12 @@ private synchronized TriggerDefinition getTriggerDefinition(String triggerDefini } /** - * Adapts {@link TriggerCreator#getRetryInterval()} and {@link TriggerCreator#getCronScheduling()} to the new model - * which make use of {@link TriggerDefinition}s + * Adapts {@link TriggerCreator#getRetryInterval()} and {@link TriggerCreator#getCronScheduling()} to the new model which make use of {@link TriggerDefinition}s * - * @param triggerCreator The {@link TriggerCreator} to adapt. - * @throws KapuaException In case that {@link TriggerDefinition} is not found. + * @param triggerCreator + * The {@link TriggerCreator} to adapt. + * @throws KapuaException + * In case that {@link TriggerDefinition} is not found. * @since 1.1.0 */ private void adaptTriggerCreator(TriggerCreator triggerCreator) throws KapuaException { @@ -408,12 +415,13 @@ private void adaptTriggerCreator(TriggerCreator triggerCreator) throws KapuaExce } /** - * Adapts {@link Trigger#getRetryInterval()} and {@link Trigger#getCronScheduling()} to the new model - * which make use of {@link TriggerDefinition}s + * Adapts {@link Trigger#getRetryInterval()} and {@link Trigger#getCronScheduling()} to the new model which make use of {@link TriggerDefinition}s * - * @param trigger The {@link Trigger} to adapt. + * @param trigger + * The {@link Trigger} to adapt. * @return - * @throws KapuaException In case that {@link TriggerDefinition} is not found. + * @throws KapuaException + * In case that {@link TriggerDefinition} is not found. * @since 1.1.0 */ private @NotNull Trigger adaptTrigger(TxContext tx, @NotNull Trigger trigger) throws KapuaException { diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialFactory.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialFactory.java index 42434a61f87..1e31dab6b5a 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialFactory.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialFactory.java @@ -12,27 +12,33 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential; +import java.util.Date; + import org.eclipse.kapua.model.KapuaEntityFactory; import org.eclipse.kapua.model.id.KapuaId; -import java.util.Date; - /** * {@link Credential} {@link KapuaEntityFactory} definition. * * @since 1.0.0 */ -public interface CredentialFactory extends KapuaEntityFactory { +public interface CredentialFactory extends KapuaEntityFactory { /** * Instantiates a new {@link Credential}. * - * @param scopeId The scope {@link KapuaId} to set into the {@link Credential}. - * @param userId The {@link org.eclipse.kapua.service.user.User} {@link KapuaId} to set into the {@link Credential}. - * @param credentialType The {@link Credential} type to set into the {@link Credential}. - * @param credentialKey The key to set into the {@link Credential}. - * @param credentialStatus The {@link CredentialStatus} to set into the {@link Credential}. - * @param expirationDate The expiration date to set into the {@link Credential}. + * @param scopeId + * The scope {@link KapuaId} to set into the {@link Credential}. + * @param userId + * The {@link org.eclipse.kapua.service.user.User} {@link KapuaId} to set into the {@link Credential}. + * @param credentialType + * The {@link Credential} type to set into the {@link Credential}. + * @param credentialKey + * The key to set into the {@link Credential}. + * @param credentialStatus + * The {@link CredentialStatus} to set into the {@link Credential}. + * @param expirationDate + * The expiration date to set into the {@link Credential}. * @return The newly instantiated {@link Credential} * @since 1.0.0 */ @@ -41,12 +47,18 @@ public interface CredentialFactory extends KapuaEntityFactory { +@XmlType +public class CredentialListResult extends KapuaListResult { + + static final long serialVersionUID = -7949012585401032274L; } diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialXmlRegistry.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialXmlRegistry.java index 0c4fa741366..6b571b48204 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialXmlRegistry.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * The {@link Credential} {@link XmlRegistry} * @@ -46,16 +46,6 @@ public CredentialCreator newCredentialCreator() { return credentialFactory.newCreator(null, null, null, null, null, null); } - /** - * Instantiates a new {@link CredentialListResult}. - * - * @return The newly instantiated {@link CredentialListResult} - * @since 1.0.0 - */ - public CredentialListResult newCredentialListResult() { - return credentialFactory.newListResult(); - } - /** * Instantiates a new {@link CredentialQuery}. * diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionFactory.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionFactory.java index 72734309d73..c21a9c159d9 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionFactory.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionFactory.java @@ -22,13 +22,15 @@ * @see KapuaEntityFactory * @since 1.3.0 */ -public interface MfaOptionFactory extends KapuaEntityFactory { +public interface MfaOptionFactory extends KapuaEntityFactory { /** * Instantiates a new {@link MfaOptionCreator}. * - * @param scopeId The scope {@link KapuaId} to set into the {@link MfaOptionCreator}. - * @param userId The {@link org.eclipse.kapua.service.user.User} {@link KapuaId} to set into the{@link AccessToken}. + * @param scopeId + * The scope {@link KapuaId} to set into the {@link MfaOptionCreator}. + * @param userId + * The {@link org.eclipse.kapua.service.user.User} {@link KapuaId} to set into the{@link AccessToken}. * @return The newly instantiated {@link MfaOptionCreator} * @since 1.3.0 */ diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionListResult.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionListResult.java index 2f9ebbcd453..bc729c21269 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionListResult.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionListResult.java @@ -12,13 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link MfaOption} {@link KapuaListResult} definition. * @@ -26,7 +26,9 @@ */ @XmlRootElement(name = "mfaOptionListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = MfaOptionXmlRegistry.class, factoryMethod = "newMfaOptionListResult") -public interface MfaOptionListResult extends KapuaListResult { +@XmlType +public class MfaOptionListResult extends KapuaListResult { + + private static final long serialVersionUID = -4204695192086365901L; } diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionXmlRegistry.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionXmlRegistry.java index 033942201c0..773adea771e 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionXmlRegistry.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/MfaOptionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class MfaOptionXmlRegistry { @@ -41,16 +41,6 @@ public MfaOption newMfaOption() { return mfaOptionFactory.newEntity(null); } - /** - * Instantiates a new {@link MfaOptionListResult} instance - * - * @return The newly instantiated {@link MfaOptionListResult} - * @since 1.3.0 - */ - public MfaOptionListResult newMfaOptionListResult() { - return mfaOptionFactory.newListResult(); - } - /** * Instantiates a new {@link MfaOptionQuery} instance. * diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeFactory.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeFactory.java index d055ddcc70e..d1d702a6e49 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeFactory.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeFactory.java @@ -15,7 +15,6 @@ import org.eclipse.kapua.model.KapuaEntityFactory; import org.eclipse.kapua.model.KapuaObjectFactory; import org.eclipse.kapua.model.id.KapuaId; -import org.eclipse.kapua.model.query.KapuaListResult; /** * {@link ScratchCode} {@link KapuaEntityFactory} definition. @@ -27,26 +26,23 @@ public interface ScratchCodeFactory extends KapuaObjectFactory { /** * Instantiates a new {@link ScratchCode}. - * @param scopeId The {@link ScratchCode#getScopeId()} + * + * @param scopeId + * The {@link ScratchCode#getScopeId()} * @return The newly instantiated {@link ScratchCode} * @since 1.3.0 */ ScratchCode newEntity(KapuaId scopeId); - /** - * Instantiates a new {@link KapuaListResult}. - * - * @return The newly instantiated {@link KapuaListResult} - * @since 1.0.0 - */ - ScratchCodeListResult newListResult(); - /** * Instantiates a new {@link ScratchCode}. * - * @param scopeId The {@link ScratchCode#getScopeId()} - * @param mfaOptionId The {@link MfaOption#getId()} - * @param code The {@link ScratchCode#getCode()}. + * @param scopeId + * The {@link ScratchCode#getScopeId()} + * @param mfaOptionId + * The {@link MfaOption#getId()} + * @param code + * The {@link ScratchCode#getCode()}. * @return The newly instantiated {@link ScratchCode} * @since 1.3.0 */ diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeListResult.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeListResult.java index a34014fb6e6..9d375196a40 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeListResult.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeListResult.java @@ -12,19 +12,21 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link ScratchCode} {@link KapuaListResult} definition. */ @XmlRootElement(name = "scratchCodeListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = ScratchCodeXmlRegistry.class, factoryMethod = "newScratchCodeListResult") -public interface ScratchCodeListResult extends KapuaListResult { +@XmlType +public class ScratchCodeListResult extends KapuaListResult { + + private static final long serialVersionUID = -5154461760797879319L; } diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeXmlRegistry.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeXmlRegistry.java index 41a194f7b52..726ab4f071c 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeXmlRegistry.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/ScratchCodeXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class ScratchCodeXmlRegistry { @@ -30,14 +30,4 @@ public class ScratchCodeXmlRegistry { public ScratchCode newScratchCode() { return scratchCodeFactory.newEntity(null); } - - /** - * Instantiates a new {@link ScratchCodeListResult} instance - * - * @return The newly instantiated {@link ScratchCodeListResult} - * @since 1.3.0 - */ - public ScratchCodeListResult newScratchCodeListResult() { - return scratchCodeFactory.newListResult(); - } } diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenFactory.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenFactory.java index 5aabab8123b..376817c9d1d 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenFactory.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenFactory.java @@ -12,27 +12,32 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.token; +import java.util.Date; + import org.eclipse.kapua.model.KapuaEntityFactory; import org.eclipse.kapua.model.id.KapuaId; -import java.util.Date; - /** * {@link AccessTokenFactory} definition. * * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface AccessTokenFactory extends KapuaEntityFactory { +public interface AccessTokenFactory extends KapuaEntityFactory { /** * Instantiates a new {@link AccessTokenCreator}. * - * @param scopeId The scope {@link KapuaId} to set into the{@link AccessToken}. - * @param userId The {@link org.eclipse.kapua.service.user.User} {@link KapuaId} to set into the{@link AccessToken}. - * @param tokenId The token id to set into the{@link AccessToken}. - * @param expiresOn The expiration date to set into the{@link AccessToken}. - * @param refreshToken The refresh token to set into the{@link AccessToken}. + * @param scopeId + * The scope {@link KapuaId} to set into the{@link AccessToken}. + * @param userId + * The {@link org.eclipse.kapua.service.user.User} {@link KapuaId} to set into the{@link AccessToken}. + * @param tokenId + * The token id to set into the{@link AccessToken}. + * @param expiresOn + * The expiration date to set into the{@link AccessToken}. + * @param refreshToken + * The refresh token to set into the{@link AccessToken}. * @return The newly instantiated {@link AccessTokenCreator}. * @since 1.0.0 */ diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenListResult.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenListResult.java index 1aac02406e8..6ce21f55b6f 100644 --- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenListResult.java +++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessTokenListResult.java @@ -18,8 +18,9 @@ * Access token list result definition. * * @since 1.0 - * */ -public interface AccessTokenListResult extends KapuaListResult { +public class AccessTokenListResult extends KapuaListResult { + + private static final long serialVersionUID = -2596004122285166444L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoFactory.java index 0e90817c47c..941d00df0bc 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface AccessInfoFactory extends KapuaEntityFactory { +public interface AccessInfoFactory extends KapuaEntityFactory { } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoListResult.java index 386d15a601a..c9ffc9f7c3f 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoListResult.java @@ -23,7 +23,9 @@ * @since 1.0.0 */ @XmlRootElement(name = "accessInfos") -@XmlType(factoryClass = AccessInfoXmlRegistry.class, factoryMethod = "newAccessInfoListResult") -public interface AccessInfoListResult extends KapuaListResult { +@XmlType +public class AccessInfoListResult extends KapuaListResult { + + static final long serialVersionUID = 2231053707705207563L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoXmlRegistry.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoXmlRegistry.java index f856ce81d65..78a7a8e4732 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoXmlRegistry.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class AccessInfoXmlRegistry { @@ -39,15 +39,6 @@ public AccessInfoCreator newAccessInfoCreator() { return accessInfoFactory.newCreator(null); } - /** - * Creates a new {@link AccessInfoListResult} instance - * - * @return - */ - public AccessInfoListResult newAccessInfoListResult() { - return accessInfoFactory.newListResult(); - } - public AccessInfoQuery newQuery() { return accessInfoFactory.newQuery(null); } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionFactory.java index 02f84fab518..f8958976955 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface AccessPermissionFactory extends KapuaEntityFactory { +public interface AccessPermissionFactory extends KapuaEntityFactory { } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionListResult.java index a2d61dabed3..2ab808b4973 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionListResult.java @@ -23,7 +23,9 @@ * @since 1.0.0 */ @XmlRootElement(name = "accessPermissions") -@XmlType(factoryClass = AccessPermissionXmlRegistry.class, factoryMethod = "newAccessPermissionListResult") -public interface AccessPermissionListResult extends KapuaListResult { +@XmlType +public class AccessPermissionListResult extends KapuaListResult { + + private static final long serialVersionUID = -7673771564266332772L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionXmlRegistry.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionXmlRegistry.java index c34f043188d..fd14485b1b9 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionXmlRegistry.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class AccessPermissionXmlRegistry { @@ -39,15 +39,6 @@ public AccessPermissionCreator newCreator() { return accessPermissionFactory.newCreator(null); } - /** - * Creates a new {@link AccessPermission} instance - * - * @return - */ - public AccessPermissionListResult newAccessPermissionListResult() { - return accessPermissionFactory.newListResult(); - } - public AccessPermissionQuery newQuery() { return accessPermissionFactory.newQuery(null); } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleFactory.java index f4e158d1310..5e9ff8007bc 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface AccessRoleFactory extends KapuaEntityFactory { +public interface AccessRoleFactory extends KapuaEntityFactory { } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleListResult.java index 5a54983a4c8..7cb32c9f004 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleListResult.java @@ -23,7 +23,9 @@ * @since 1.0.0 */ @XmlRootElement(name = "accessPermissions") -@XmlType(factoryClass = AccessRoleXmlRegistry.class, factoryMethod = "newAccessRoleListResult") -public interface AccessRoleListResult extends KapuaListResult { +@XmlType +public class AccessRoleListResult extends KapuaListResult { + + private static final long serialVersionUID = 2406073775830391702L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleXmlRegistry.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleXmlRegistry.java index 0b8ef61befc..1131edbd059 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleXmlRegistry.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class AccessRoleXmlRegistry { @@ -39,15 +39,6 @@ public AccessRoleCreator newCreator() { return accessRoleFactory.newCreator(null); } - /** - * Creates a new {@link AccessRole} instance - * - * @return - */ - public AccessRoleListResult newAccessRoleListResult() { - return accessRoleFactory.newListResult(); - } - public AccessRoleQuery newQuery() { return accessRoleFactory.newQuery(null); } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainFactory.java index faed82b4ee8..a99af9f63b0 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainFactory.java @@ -20,12 +20,13 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface DomainFactory extends KapuaEntityFactory { +public interface DomainFactory extends KapuaEntityFactory { /** * Instantiates a new {@link DomainCreator} * - * @param name The name to set into the {@link Domain}. + * @param name + * The name to set into the {@link Domain}. * @return The newly instantiated {@link Domain}. * @since 1.0.0 */ diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainListResult.java index c38cffc1a20..7426fe39b02 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/domain/DomainListResult.java @@ -22,6 +22,8 @@ * @since 1.0.0 */ @XmlRootElement(name = "domains") -public interface DomainListResult extends KapuaListResult { +public class DomainListResult extends KapuaListResult { + + private static final long serialVersionUID = -5086830452591857912L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupFactory.java index 01d084daf4a..2aa4e192bba 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupFactory.java @@ -21,13 +21,15 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface GroupFactory extends KapuaEntityFactory { +public interface GroupFactory extends KapuaEntityFactory { /** * Instantiates a new {@link GroupCreator}. * - * @param scopeId The scope {@link KapuaId} to set into the {@link GroupCreator} - * @param name The name to set into the {@link GroupCreator} + * @param scopeId + * The scope {@link KapuaId} to set into the {@link GroupCreator} + * @param name + * The name to set into the {@link GroupCreator} * @return The newly instantatied {@link GroupCreator} * @since 1.0.0 */ diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupListResult.java index 024c5c0baa1..f41dbc3cbce 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupListResult.java @@ -23,7 +23,9 @@ * @since 1.0.0 */ @XmlRootElement(name = "groups") -@XmlType(factoryClass = GroupXmlRegistry.class, factoryMethod = "newGroupListResult") -public interface GroupListResult extends KapuaListResult { +@XmlType +public class GroupListResult extends KapuaListResult { + + private static final long serialVersionUID = 791258978210911362L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupXmlRegistry.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupXmlRegistry.java index 31f777e9ca4..60c3299bd2b 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupXmlRegistry.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/GroupXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.group; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class GroupXmlRegistry { @@ -41,16 +41,6 @@ public GroupCreator newGroupCreator() { return groupFactory.newCreator(null, null); } - /** - * Creates a new {@link GroupListResult} instance. - * - * @return The newly created {@link GroupListResult} instance. - * @since 1.0.0 - */ - public GroupListResult newGroupListResult() { - return groupFactory.newListResult(); - } - /** * Creates a new {@link GroupQuery} instance. * diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleFactory.java index 209b342c0b6..8fa873eae5c 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleFactory.java @@ -20,7 +20,7 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface RoleFactory extends KapuaEntityFactory { +public interface RoleFactory extends KapuaEntityFactory { /** * Instantiates a new {@link RolePermission}. diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleListResult.java index 94027eff5cd..0b942bb4f05 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleListResult.java @@ -23,7 +23,9 @@ * @since 1.0.0 */ @XmlRootElement(name = "roles") -@XmlType(factoryClass = RoleXmlRegistry.class, factoryMethod = "newRoleListResult") -public interface RoleListResult extends KapuaListResult { +@XmlType +public class RoleListResult extends KapuaListResult { + + private static final long serialVersionUID = -5902522234186399802L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionFactory.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionFactory.java index e97e7177f2c..f524ba277f9 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionFactory.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionFactory.java @@ -20,6 +20,6 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface RolePermissionFactory extends KapuaEntityFactory { +public interface RolePermissionFactory extends KapuaEntityFactory { } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionListResult.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionListResult.java index 7bb2c6b935d..936734d4232 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionListResult.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionListResult.java @@ -23,7 +23,9 @@ * @since 1.0.0 */ @XmlRootElement(name = "rolePermissions") -@XmlType(factoryClass = RolePermissionXmlRegistry.class, factoryMethod = "newRolePermissionListResult") -public interface RolePermissionListResult extends KapuaListResult { +@XmlType +public class RolePermissionListResult extends KapuaListResult { + + private static final long serialVersionUID = -4732941050197499090L; } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionXmlRegistry.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionXmlRegistry.java index 583394b80c2..5595b62d70f 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionXmlRegistry.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.role; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class RolePermissionXmlRegistry { @@ -39,15 +39,6 @@ public RolePermissionCreator newCreator() { return rolePermissionFactory.newCreator(null); } - /** - * Creates a new {@link RolePermissionListResult} instance - * - * @return - */ - public RolePermissionListResult newRolePermissionListResult() { - return rolePermissionFactory.newListResult(); - } - public RolePermissionQuery newQuery() { return rolePermissionFactory.newQuery(null); } diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleXmlRegistry.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleXmlRegistry.java index b46b8aa8af1..003054d4aa2 100644 --- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleXmlRegistry.java +++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RoleXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.role; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class RoleXmlRegistry { @@ -41,16 +41,6 @@ public RoleCreator newRoleCreator() { return roleFactory.newCreator(null); } - /** - * Creates a new {@link RoleListResult} instance. - * - * @return The newly created {@link RoleListResult} instance. - * @since 1.0.0 - */ - public RoleListResult newRoleListResult() { - return roleFactory.newListResult(); - } - /** * Creates a new {@link RoleQuery} instance. * diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateFactory.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateFactory.java index 0006c87a0bb..d4864bd3fe2 100644 --- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateFactory.java +++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateFactory.java @@ -20,12 +20,13 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface CertificateFactory extends KapuaEntityFactory { +public interface CertificateFactory extends KapuaEntityFactory { /** * Instantiates a new {@link CertificateUsage}. * - * @param name The name to set into the {@link CertificateUsage} + * @param name + * The name to set into the {@link CertificateUsage} * @return The newly instantiated {@link CertificateUsage} * @since 1.0.0 */ @@ -34,9 +35,12 @@ public interface CertificateFactory extends KapuaEntityFactory { +@XmlType +public class CertificateListResult extends KapuaListResult { + } diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoFactory.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoFactory.java index e188bd24b7a..976419bbe9b 100644 --- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoFactory.java +++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoFactory.java @@ -17,5 +17,6 @@ /** * @since 1.1.0 */ -public interface CertificateInfoFactory extends KapuaEntityFactory { +public interface CertificateInfoFactory extends KapuaEntityFactory { + } diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoListResult.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoListResult.java index 5e1c679e2ff..3c66f97bbba 100644 --- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoListResult.java +++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfoListResult.java @@ -12,19 +12,19 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.info; -import org.eclipse.kapua.model.query.KapuaListResult; -import org.eclipse.kapua.service.certificate.info.xml.CertificateInfoXmlRegistry; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * @since 1.1.0 */ @XmlRootElement(name = "certificateListResult") @XmlAccessorType(XmlAccessType.PROPERTY) -@XmlType(factoryClass = CertificateInfoXmlRegistry.class, factoryMethod = "newListResult") -public interface CertificateInfoListResult extends KapuaListResult { +@XmlType +public class CertificateInfoListResult extends KapuaListResult { + } diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/xml/CertificateInfoXmlRegistry.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/xml/CertificateInfoXmlRegistry.java index 8400f77b56f..0da71c138a1 100644 --- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/xml/CertificateInfoXmlRegistry.java +++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/xml/CertificateInfoXmlRegistry.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.info.xml; +import javax.xml.bind.annotation.XmlRegistry; + import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.service.certificate.info.CertificateInfo; import org.eclipse.kapua.service.certificate.info.CertificateInfoCreator; import org.eclipse.kapua.service.certificate.info.CertificateInfoFactory; -import org.eclipse.kapua.service.certificate.info.CertificateInfoListResult; import org.eclipse.kapua.service.certificate.info.CertificateInfoQuery; -import javax.xml.bind.annotation.XmlRegistry; - @XmlRegistry public class CertificateInfoXmlRegistry { @@ -37,8 +36,4 @@ public CertificateInfoCreator newCreator() { public CertificateInfoQuery newQuery() { return certificateInfoFactory.newQuery(null); } - - public CertificateInfoListResult newListResult() { - return certificateInfoFactory.newListResult(); - } } diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/xml/CertificateXmlRegistry.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/xml/CertificateXmlRegistry.java index 588be879c8f..52e69f3fb16 100644 --- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/xml/CertificateXmlRegistry.java +++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/xml/CertificateXmlRegistry.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.xml; +import javax.xml.bind.annotation.XmlRegistry; + import org.eclipse.kapua.locator.KapuaLocator; import org.eclipse.kapua.service.certificate.Certificate; import org.eclipse.kapua.service.certificate.CertificateCreator; import org.eclipse.kapua.service.certificate.CertificateFactory; import org.eclipse.kapua.service.certificate.CertificateGenerator; -import org.eclipse.kapua.service.certificate.CertificateListResult; import org.eclipse.kapua.service.certificate.CertificateQuery; import org.eclipse.kapua.service.certificate.CertificateUsage; -import javax.xml.bind.annotation.XmlRegistry; - @XmlRegistry public class CertificateXmlRegistry { @@ -40,10 +39,6 @@ public CertificateQuery newQuery() { return certificateFactory.newQuery(null); } - public CertificateListResult newListResult() { - return certificateFactory.newListResult(); - } - public CertificateGenerator newCertificateGenerator() { return certificateFactory.newCertificateGenerator(); } diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoFactoryImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoFactoryImpl.java index 06d67d43e0b..8b3184f3c08 100644 --- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoFactoryImpl.java +++ b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.info.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.certificate.info.CertificateInfo; import org.eclipse.kapua.service.certificate.info.CertificateInfoCreator; import org.eclipse.kapua.service.certificate.info.CertificateInfoFactory; -import org.eclipse.kapua.service.certificate.info.CertificateInfoListResult; import org.eclipse.kapua.service.certificate.info.CertificateInfoQuery; -import javax.inject.Singleton; - @Singleton public class CertificateInfoFactoryImpl implements CertificateInfoFactory { @@ -40,11 +39,6 @@ public CertificateInfoQuery newQuery(KapuaId scopeId) { return new CertificateInfoQueryImpl(scopeId); } - @Override - public CertificateInfoListResult newListResult() { - return new CertificateInfoListResultImpl(); - } - @Override public CertificateInfo clone(CertificateInfo certificateInfo) throws KapuaEntityCloneException { try { diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoListResultImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoListResultImpl.java deleted file mode 100644 index d1c3dc2b83a..00000000000 --- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.certificate.info.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.certificate.info.CertificateInfo; -import org.eclipse.kapua.service.certificate.info.CertificateInfoListResult; - -/** - * {@link CertificateInfoListResult} implementation. - * - * @since 1.0 - */ - -public class CertificateInfoListResultImpl extends KapuaListResultImpl implements CertificateInfoListResult { - -} diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoServiceImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoServiceImpl.java index 1d99a7c42d1..2fbd815de1a 100644 --- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoServiceImpl.java +++ b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/info/internal/CertificateInfoServiceImpl.java @@ -12,6 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.info.internal; +import java.util.List; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.util.ArgumentValidator; import org.eclipse.kapua.model.id.KapuaId; @@ -26,10 +31,6 @@ import org.eclipse.kapua.service.certificate.info.CertificateInfoService; import org.eclipse.kapua.service.certificate.internal.CertificateQueryImpl; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.List; - @Singleton public class CertificateInfoServiceImpl implements CertificateInfoService { @@ -56,7 +57,7 @@ public CertificateInfoListResult query(KapuaQuery query) throws KapuaException { CertificateQuery certificateQuery = new CertificateQueryImpl(query); - CertificateInfoListResult publicCertificates = new CertificateInfoListResultImpl(); + CertificateInfoListResult publicCertificates = new CertificateInfoListResult(); publicCertificates.addItem(certificateService.query(certificateQuery).getFirstItem()); return publicCertificates; diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateFactoryImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateFactoryImpl.java index 8f0e7a4bf9b..64420883810 100644 --- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateFactoryImpl.java +++ b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateFactoryImpl.java @@ -12,20 +12,19 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.certificate.Certificate; import org.eclipse.kapua.service.certificate.CertificateCreator; import org.eclipse.kapua.service.certificate.CertificateFactory; import org.eclipse.kapua.service.certificate.CertificateGenerator; -import org.eclipse.kapua.service.certificate.CertificateListResult; import org.eclipse.kapua.service.certificate.CertificateQuery; import org.eclipse.kapua.service.certificate.CertificateUsage; import org.eclipse.kapua.service.certificate.KeyUsage; import org.eclipse.kapua.service.certificate.KeyUsageSetting; -import javax.inject.Singleton; - /** * {@link CertificateFactory} implementation. * @@ -49,11 +48,6 @@ public CertificateQuery newQuery(KapuaId scopeId) { return new CertificateQueryImpl(scopeId); } - @Override - public CertificateListResult newListResult() { - return new CertificateListResultImpl(); - } - @Override public CertificateUsage newCertificateUsage(String name) { return new CertificateUsageImpl(name); diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateListResultImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateListResultImpl.java deleted file mode 100644 index fb00cdb2eaa..00000000000 --- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.certificate.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.certificate.Certificate; -import org.eclipse.kapua.service.certificate.CertificateListResult; - -/** - * {@link CertificateListResult} implementation. - * - * @since 1.0 - */ - -public class CertificateListResultImpl extends KapuaListResultImpl implements CertificateListResult { - -} diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java index d898bc207bd..dd933060b04 100644 --- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java +++ b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java @@ -12,8 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.certificate.internal; -import com.google.common.base.Strings; -import com.google.common.collect.Sets; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.inject.Inject; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.configuration.metatype.EmptyTocd; import org.eclipse.kapua.commons.model.domains.Domains; @@ -43,12 +49,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.inject.Singleton; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.base.Strings; +import com.google.common.collect.Sets; @Singleton public class CertificateServiceImpl implements CertificateService { @@ -65,7 +67,7 @@ public class CertificateServiceImpl implements CertificateService { @Inject public CertificateServiceImpl(AuthorizationService authorizationService, PermissionFactory permissionFactory, CertificateFactory certificateFactory, - KapuaCertificateSetting kapuaCertificateSetting) throws KapuaException { + KapuaCertificateSetting kapuaCertificateSetting) throws KapuaException { this.authorizationService = authorizationService; this.permissionFactory = permissionFactory; this.certificateFactory = certificateFactory; @@ -119,7 +121,7 @@ public CertificateListResult query(KapuaQuery query) throws KapuaException { kapuaCertificate.setCertificateUsages(certificateUsages); kapuaCertificate.setPassword(kapuaCertificateSetting.getString(KapuaCertificateSettingKeys.CERTIFICATE_JWT_PRIVATE_KEY_PASSWORD)); - CertificateListResult result = certificateFactory.newListResult(); + CertificateListResult result = new CertificateListResult(); result.addItem(kapuaCertificate); return result; diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImpl.java index 71466810c72..a6b119cdeb1 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImpl.java @@ -12,27 +12,21 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOption; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionCreator; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionFactory; -import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionListResult; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionQuery; -import javax.inject.Singleton; - /** * {@link MfaOptionFactory} implementation. */ @Singleton public class MfaOptionFactoryImpl implements MfaOptionFactory { - @Override - public MfaOptionListResult newListResult() { - return new MfaOptionListResultImpl(); - } - @Override public MfaOption newEntity(KapuaId scopeId) { return new MfaOptionImpl(scopeId); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionImplJpaRepository.java index 653f0cd1091..450d8487558 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionImplJpaRepository.java @@ -27,8 +27,9 @@ public class MfaOptionImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements MfaOptionRepository { + public MfaOptionImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(MfaOptionImpl.class, MfaOption.TYPE, MfaOptionListResultImpl::new, jpaRepoConfig); + super(MfaOptionImpl.class, MfaOption.TYPE, MfaOptionListResult::new, jpaRepoConfig); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionListResultImpl.java deleted file mode 100644 index ec3582158ac..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionListResultImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authentication.credential.mfa.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authentication.credential.mfa.MfaOption; -import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionListResult; - -/** - * {@link MfaOption} list result implementation. - */ -public class MfaOptionListResultImpl extends KapuaListResultImpl implements MfaOptionListResult { - - private static final long serialVersionUID = -4204695192086365901L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionServiceImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionServiceImpl.java index e12a28124c0..9cac6d68f6a 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionServiceImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionServiceImpl.java @@ -178,9 +178,8 @@ private User fetchUser(MfaOptionCreator mfaOptionCreator) throws KapuaException } /** - * Generates all the scratch codes. - * The number of generated scratch codes is decided through the {@link org.eclipse.kapua.service.authentication.mfa.MfaAuthenticator} service. - * The scratch code provided within the scratchCodeCreator parameter is ignored. + * Generates all the scratch codes. The number of generated scratch codes is decided through the {@link org.eclipse.kapua.service.authentication.mfa.MfaAuthenticator} service. The scratch code + * provided within the scratchCodeCreator parameter is ignored. * * @return * @throws KapuaException @@ -221,7 +220,7 @@ public MfaOption find(KapuaId scopeId, KapuaId mfaOptionId) throws KapuaExceptio } private MfaOption clearSecuritySensibleFields(MfaOption mfaOption) { -// Set the mfa secret key to null before returning the mfaOption, because they should never be seen again + // Set the mfa secret key to null before returning the mfaOption, because they should never be seen again mfaOption.setMfaSecretKey(null); mfaOption.setTrustKey(null); mfaOption.setScratchCodes(null); @@ -238,7 +237,7 @@ public MfaOptionListResult query(KapuaQuery query) throws KapuaException { final MfaOptionListResult res = txManager.execute(tx -> mfaOptionRepository.query(tx, query)); if (res.isEmpty() == false) { - final MfaOptionListResultImpl cleanedRes = new MfaOptionListResultImpl(); + final MfaOptionListResult cleanedRes = new MfaOptionListResult(); cleanedRes.setLimitExceeded(res.isLimitExceeded()); cleanedRes.setTotalCount(res.getTotalCount()); cleanedRes.addItems(res.getItems() @@ -471,7 +470,6 @@ private MfaOption doDisableTrust(TxContext tx, MfaOption mfaOption) throws Kapua return mfaOptionRepository.update(tx, mfaOption); } - /** * Generate the trust key string. * @@ -483,13 +481,17 @@ private String generateTrustKey() { } /** - * Produce a QR code in base64 format for the authenticator app. - * This QR code generator follows the spec detailed here for the URI format: https://github.com/google/google-authenticator/wiki/Key-Uri-Format + * Produce a QR code in base64 format for the authenticator app. This QR code generator follows the spec detailed here for the URI format: + * https://github.com/google/google-authenticator/wiki/Key-Uri-Format * - * @param organizationName the organization name to be used as issuer in the QR code - * @param accountName the account name of the account to which the user belongs - * @param username the username - * @param key the Mfa secret key in plain text + * @param organizationName + * the organization name to be used as issuer in the QR code + * @param accountName + * the account name of the account to which the user belongs + * @param username + * the username + * @param key + * the Mfa secret key in plain text * @return the QR code image in base64 format * @since 1.3.0 */ diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeFactoryImpl.java index 2e0dfd6f57d..a3fc3c2874e 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeFactoryImpl.java @@ -12,12 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authentication.credential.mfa.ScratchCode; import org.eclipse.kapua.service.authentication.credential.mfa.ScratchCodeFactory; -import org.eclipse.kapua.service.authentication.credential.mfa.ScratchCodeListResult; - -import javax.inject.Singleton; /** * {@link ScratchCodeFactory} implementation. @@ -30,11 +29,6 @@ public ScratchCode newEntity(KapuaId scopeId) { return new ScratchCodeImpl(scopeId); } - @Override - public ScratchCodeListResult newListResult() { - return new ScratchCodeListResultImpl(); - } - @Override public ScratchCode newScratchCode(KapuaId scopeId, KapuaId mfaOptionId, String code) { return new ScratchCodeImpl(scopeId, mfaOptionId, code); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeImplJpaRepository.java index 5f7ff836690..aa3a1251be0 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeImplJpaRepository.java @@ -26,7 +26,7 @@ public class ScratchCodeImplJpaRepository implements ScratchCodeRepository { public ScratchCodeImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(ScratchCodeImpl.class, ScratchCode.TYPE, () -> new ScratchCodeListResultImpl(), jpaRepoConfig); + super(ScratchCodeImpl.class, ScratchCode.TYPE, () -> new ScratchCodeListResult(), jpaRepoConfig); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeListResultImpl.java deleted file mode 100644 index fc5133dc0dd..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/ScratchCodeListResultImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authentication.credential.mfa.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authentication.credential.mfa.ScratchCode; -import org.eclipse.kapua.service.authentication.credential.mfa.ScratchCodeListResult; - -/** - * {@link ScratchCode} list result implementation. - */ -public class ScratchCodeListResultImpl extends KapuaListResultImpl implements ScratchCodeListResult { - - private static final long serialVersionUID = -5154461760797879319L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImpl.java index 0aeb713afb7..ea51f3eb37b 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImpl.java @@ -12,18 +12,18 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.shiro; +import java.util.Date; + +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authentication.credential.Credential; import org.eclipse.kapua.service.authentication.credential.CredentialCreator; import org.eclipse.kapua.service.authentication.credential.CredentialFactory; -import org.eclipse.kapua.service.authentication.credential.CredentialListResult; import org.eclipse.kapua.service.authentication.credential.CredentialQuery; import org.eclipse.kapua.service.authentication.credential.CredentialStatus; -import javax.inject.Singleton; -import java.util.Date; - /** * {@link CredentialFactory} implementation. * @@ -37,11 +37,6 @@ public CredentialCreatorImpl newCreator(KapuaId scopeId, KapuaId userId, String return new CredentialCreatorImpl(scopeId, userId, credentialType, credentialKey, credentialStatus, expirationDate); } - @Override - public CredentialListResult newListResult() { - return new CredentialListResultImpl(); - } - @Override public Credential newEntity(KapuaId scopeId) { return new CredentialImpl(scopeId); @@ -62,7 +57,6 @@ public CredentialCreator newCreator(KapuaId scopeId) { return new CredentialCreatorImpl(scopeId); } - @Override public Credential clone(Credential credential) { try { diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialImplJpaRepository.java index f851f1b30ff..af27a73cacd 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialImplJpaRepository.java @@ -33,11 +33,12 @@ public class CredentialImplJpaRepository /** * Constructor. * - * @param jpaRepoConfig The {@link KapuaJpaRepositoryConfiguration}. + * @param jpaRepoConfig + * The {@link KapuaJpaRepositoryConfiguration}. * @since 2.0.0 */ public CredentialImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(CredentialImpl.class, Credential.TYPE, CredentialListResultImpl::new, jpaRepoConfig); + super(CredentialImpl.class, Credential.TYPE, CredentialListResult::new, jpaRepoConfig); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialListResultImpl.java deleted file mode 100644 index 28a039e71c5..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authentication.credential.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authentication.credential.Credential; -import org.eclipse.kapua.service.authentication.credential.CredentialListResult; - -/** - * {@link CredentialListResult} implementation. - * - * @since 1.0.0 - */ -public class CredentialListResultImpl extends KapuaListResultImpl implements CredentialListResult { - - static final long serialVersionUID = -7949012585401032274L; - -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImpl.java index 4f884bc8c4e..56d100af555 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImpl.java @@ -12,18 +12,18 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.token.shiro; +import java.util.Date; + +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authentication.token.AccessToken; import org.eclipse.kapua.service.authentication.token.AccessTokenCreator; import org.eclipse.kapua.service.authentication.token.AccessTokenFactory; -import org.eclipse.kapua.service.authentication.token.AccessTokenListResult; import org.eclipse.kapua.service.authentication.token.AccessTokenQuery; import org.eclipse.kapua.service.authentication.token.LoginInfo; -import javax.inject.Singleton; -import java.util.Date; - /** * {@link AccessTokenFactory} implementation. * @@ -61,11 +61,6 @@ public AccessTokenQuery newQuery(KapuaId scopeId) { return new AccessTokenQueryImpl(scopeId); } - @Override - public AccessTokenListResult newListResult() { - return new AccessTokenListResultImpl(); - } - @Override public AccessToken clone(AccessToken accessToken) { try { diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenImplJpaRepository.java index 810b05c6ebe..27ba8c7ac7d 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenImplJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.token.shiro; +import java.util.Optional; + import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaUpdatableEntityJpaRepository; import org.eclipse.kapua.model.id.KapuaId; @@ -21,13 +23,12 @@ import org.eclipse.kapua.service.authentication.token.AccessTokenRepository; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class AccessTokenImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements AccessTokenRepository { + public AccessTokenImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(AccessTokenImpl.class, AccessToken.TYPE, () -> new AccessTokenListResultImpl(), jpaRepoConfig); + super(AccessTokenImpl.class, AccessToken.TYPE, () -> new AccessTokenListResult(), jpaRepoConfig); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenListResultImpl.java deleted file mode 100644 index b420d1ac5e9..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authentication.token.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authentication.token.AccessToken; -import org.eclipse.kapua.service.authentication.token.AccessTokenListResult; - -/** - * Access token list result implementation. - * - * @since 1.0 - * - */ -public class AccessTokenListResultImpl extends KapuaListResultImpl implements AccessTokenListResult { - private static final long serialVersionUID = -2596004122285166444L; - -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImpl.java index e98d2993560..0985c4cbe21 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.access.AccessInfo; import org.eclipse.kapua.service.authorization.access.AccessInfoCreator; import org.eclipse.kapua.service.authorization.access.AccessInfoFactory; -import org.eclipse.kapua.service.authorization.access.AccessInfoListResult; import org.eclipse.kapua.service.authorization.access.AccessInfoQuery; -import javax.inject.Singleton; - /** * {@link AccessInfoFactory} implementation. * @@ -45,11 +44,6 @@ public AccessInfoQuery newQuery(KapuaId scopeId) { return new AccessInfoQueryImpl(scopeId); } - @Override - public AccessInfoListResult newListResult() { - return new AccessInfoListResultImpl(); - } - @Override public AccessInfo clone(AccessInfo accessInfo) { try { diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoImplJpaRepository.java index 0c9934bbec5..709335bcbb2 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoImplJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import java.util.Optional; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaUpdatableEntityJpaRepository; @@ -22,13 +24,12 @@ import org.eclipse.kapua.service.authorization.access.AccessInfoRepository; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class AccessInfoImplJpaRepository extends KapuaUpdatableEntityJpaRepository implements AccessInfoRepository { + public AccessInfoImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(AccessInfoImpl.class, AccessInfo.TYPE, () -> new AccessInfoListResultImpl(), jpaRepoConfig); + super(AccessInfoImpl.class, AccessInfo.TYPE, () -> new AccessInfoListResult(), jpaRepoConfig); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoListResultImpl.java deleted file mode 100644 index 8f8cf15910a..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.access.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.access.AccessInfo; -import org.eclipse.kapua.service.authorization.access.AccessInfoListResult; - -/** - * Access info list result implementation. - * - * @since 1.0 - * - */ -public class AccessInfoListResultImpl extends KapuaListResultImpl implements AccessInfoListResult { - - static final long serialVersionUID = 2231053707705207563L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImpl.java index 581f01ac3e4..9b870e015a7 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImpl.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.access.AccessPermission; import org.eclipse.kapua.service.authorization.access.AccessPermissionCreator; import org.eclipse.kapua.service.authorization.access.AccessPermissionFactory; -import org.eclipse.kapua.service.authorization.access.AccessPermissionListResult; import org.eclipse.kapua.service.authorization.access.AccessPermissionQuery; -import javax.inject.Singleton; - /** * {@link AccessPermissionFactory} implementation. * @@ -44,11 +43,6 @@ public AccessPermissionQuery newQuery(KapuaId scopeId) { return new AccessPermissionQueryImpl(scopeId); } - @Override - public AccessPermissionListResult newListResult() { - return new AccessPermissionListResultImpl(); - } - @Override public AccessPermission clone(AccessPermission accessPermission) { return new AccessPermissionImpl(accessPermission); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionImplJpaRepository.java index 89b00901402..b80c2c6a4db 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionImplJpaRepository.java @@ -12,6 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import java.util.List; +import java.util.stream.Collectors; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaDelete; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Root; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.JpaAwareTxContext; import org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository; @@ -27,20 +36,12 @@ import org.eclipse.kapua.service.authorization.permission.shiro.PermissionImpl_; import org.eclipse.kapua.storage.TxContext; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import java.util.List; -import java.util.stream.Collectors; - public class AccessPermissionImplJpaRepository extends KapuaEntityJpaRepository implements AccessPermissionRepository { public AccessPermissionImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(AccessPermissionImpl.class, AccessPermission.TYPE, () -> new AccessPermissionListResultImpl(), configuration); + super(AccessPermissionImpl.class, AccessPermission.TYPE, () -> new AccessPermissionListResult(), configuration); } @Override @@ -72,7 +73,7 @@ public AccessPermissionListResult deleteAllByDomainAndAction(TxContext tx, Strin deleteQuery.where(deleteRoot.get(AccessPermissionImpl_.id).in(resultList.stream().map(r -> r.getId()).map(KapuaEid::parseKapuaId).collect(Collectors.toList()))); em.createQuery(deleteQuery).executeUpdate(); } - final AccessPermissionListResultImpl res = new AccessPermissionListResultImpl(); + final AccessPermissionListResult res = new AccessPermissionListResult(); res.addItems(resultList); return res; } diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionListResultImpl.java deleted file mode 100644 index 0a12dd615f8..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.access.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.access.AccessPermission; -import org.eclipse.kapua.service.authorization.access.AccessPermissionListResult; - -/** - * {@link AccessPermission} list result implementation. - * - * @since 1.0.0 - * - */ -public class AccessPermissionListResultImpl extends KapuaListResultImpl implements AccessPermissionListResult { - - private static final long serialVersionUID = -7673771564266332772L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImpl.java index cb12d7f2f8c..0f69305d4ea 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.access.AccessRole; import org.eclipse.kapua.service.authorization.access.AccessRoleCreator; import org.eclipse.kapua.service.authorization.access.AccessRoleFactory; -import org.eclipse.kapua.service.authorization.access.AccessRoleListResult; import org.eclipse.kapua.service.authorization.access.AccessRoleQuery; -import javax.inject.Singleton; - /** * {@link AccessRoleFactory} implementation. * @@ -45,11 +44,6 @@ public AccessRoleQuery newQuery(KapuaId scopeId) { return new AccessRoleQueryImpl(scopeId); } - @Override - public AccessRoleListResult newListResult() { - return new AccessRoleListResultImpl(); - } - @Override public AccessRole clone(AccessRole accessRole) { try { diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleImplJpaRepository.java index d3d208507e9..b9346e504cc 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleImplJpaRepository.java @@ -25,8 +25,9 @@ public class AccessRoleImplJpaRepository extends KapuaEntityJpaRepository implements AccessRoleRepository { + public AccessRoleImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(AccessRoleImpl.class, AccessRole.TYPE, () -> new AccessRoleListResultImpl(), configuration); + super(AccessRoleImpl.class, AccessRole.TYPE, () -> new AccessRoleListResult(), configuration); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleListResultImpl.java deleted file mode 100644 index 34d3db38048..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.access.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.access.AccessRole; -import org.eclipse.kapua.service.authorization.access.AccessRoleListResult; - -/** - * {@link AccessRole} list result implementation. - * - * @since 1.0.0 - * - */ -public class AccessRoleListResultImpl extends KapuaListResultImpl implements AccessRoleListResult { - - private static final long serialVersionUID = 2406073775830391702L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImpl.java index 39a0344bb18..2a618267c57 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.domain.shiro; +import javax.inject.Singleton; + import org.apache.commons.lang.NotImplementedException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.domain.Domain; import org.eclipse.kapua.service.authorization.domain.DomainCreator; import org.eclipse.kapua.service.authorization.domain.DomainFactory; -import org.eclipse.kapua.service.authorization.domain.DomainListResult; import org.eclipse.kapua.service.authorization.domain.DomainQuery; -import javax.inject.Singleton; - /** * {@link DomainFactory} implementation. * @@ -35,11 +34,6 @@ public DomainCreator newCreator(String name) { return new DomainCreatorImpl(name); } - @Override - public DomainListResult newListResult() { - return new DomainListResultImpl(); - } - @Override public DomainQuery newQuery(KapuaId scopeId) { return new DomainQueryImpl(scopeId); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainImplJpaRepository.java index 26495442aa7..913362d1077 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainImplJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.domain.shiro; +import java.util.Optional; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository; import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; @@ -22,13 +24,12 @@ import org.eclipse.kapua.service.authorization.domain.DomainRepository; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class DomainImplJpaRepository extends KapuaEntityJpaRepository implements DomainRepository { + public DomainImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(DomainImpl.class, Domain.TYPE, () -> new DomainListResultImpl(), configuration); + super(DomainImpl.class, Domain.TYPE, () -> new DomainListResult(), configuration); } @Override diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainListResultImpl.java deleted file mode 100644 index f1f34c3fddf..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.domain.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.domain.Domain; -import org.eclipse.kapua.service.authorization.domain.DomainListResult; - -/** - * {@link DomainListResult} implementation. - * - * @since 1.0.0 - */ -public class DomainListResultImpl extends KapuaListResultImpl implements DomainListResult { - - private static final long serialVersionUID = -5086830452591857912L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImpl.java index a0ac8e5cdae..a13a4287fbc 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.group.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.group.Group; import org.eclipse.kapua.service.authorization.group.GroupCreator; import org.eclipse.kapua.service.authorization.group.GroupFactory; -import org.eclipse.kapua.service.authorization.group.GroupListResult; import org.eclipse.kapua.service.authorization.group.GroupQuery; -import javax.inject.Singleton; - /** * {@link GroupFactory} implementation. * @@ -44,11 +43,6 @@ public Group newEntity(KapuaId scopeId) { return new GroupImpl(scopeId); } - @Override - public GroupListResult newListResult() { - return new GroupListResultImpl(); - } - @Override public GroupQuery newQuery(KapuaId scopeId) { return new GroupQueryImpl(scopeId); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupImplJpaRepository.java index 5783607f062..0b33cdf6a36 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupImplJpaRepository.java @@ -21,8 +21,9 @@ public class GroupImplJpaRepository extends KapuaNamedEntityJpaRepository implements GroupRepository { + public GroupImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(GroupImpl.class, Group.TYPE, () -> new GroupListResultImpl(), jpaRepoConfig); + super(GroupImpl.class, Group.TYPE, () -> new GroupListResult(), jpaRepoConfig); } } diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupListResultImpl.java deleted file mode 100644 index a9b06f298ff..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/group/shiro/GroupListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.group.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.group.Group; -import org.eclipse.kapua.service.authorization.group.GroupListResult; - -/** - * {@link GroupListResult} implementation. - * - * @since 1.0.0 - */ -public class GroupListResultImpl extends KapuaListResultImpl implements GroupListResult { - - private static final long serialVersionUID = 791258978210911362L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImpl.java index 29443481b8e..145649c3377 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImpl.java @@ -12,17 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.role.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.role.Role; import org.eclipse.kapua.service.authorization.role.RoleCreator; import org.eclipse.kapua.service.authorization.role.RoleFactory; -import org.eclipse.kapua.service.authorization.role.RoleListResult; import org.eclipse.kapua.service.authorization.role.RolePermission; import org.eclipse.kapua.service.authorization.role.RoleQuery; -import javax.inject.Singleton; - /** * {@link RoleFactory} implementation. * @@ -46,11 +45,6 @@ public RoleQuery newQuery(KapuaId scopeId) { return new RoleQueryImpl(scopeId); } - @Override - public RoleListResult newListResult() { - return new RoleListResultImpl(); - } - @Override public RolePermission newRolePermission() { return new RolePermissionImpl(); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleImplJpaRepository.java index d02d4aae0dd..cf780b0dd28 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleImplJpaRepository.java @@ -21,8 +21,9 @@ public class RoleImplJpaRepository extends KapuaNamedEntityJpaRepository implements RoleRepository { + public RoleImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(RoleImpl.class, Role.TYPE, () -> new RoleListResultImpl(), jpaRepoConfig); + super(RoleImpl.class, Role.TYPE, () -> new RoleListResult(), jpaRepoConfig); } } diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleListResultImpl.java deleted file mode 100644 index b61c8834bd6..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RoleListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.role.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.role.Role; -import org.eclipse.kapua.service.authorization.role.RoleListResult; - -/** - * Role list result implementation. - * - * @since 1.0 - * - */ -public class RoleListResultImpl extends KapuaListResultImpl implements RoleListResult { - - private static final long serialVersionUID = -5902522234186399802L; -} diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionFactoryImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionFactoryImpl.java index d145edff977..f2719eb11f0 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionFactoryImpl.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionFactoryImpl.java @@ -12,15 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.role.shiro; +import javax.inject.Singleton; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.authorization.role.RolePermission; import org.eclipse.kapua.service.authorization.role.RolePermissionCreator; import org.eclipse.kapua.service.authorization.role.RolePermissionFactory; -import org.eclipse.kapua.service.authorization.role.RolePermissionListResult; import org.eclipse.kapua.service.authorization.role.RolePermissionQuery; -import javax.inject.Singleton; - /** * {@link RolePermissionFactory} implementation. * @@ -44,11 +43,6 @@ public RolePermissionQuery newQuery(KapuaId scopeId) { return new RolePermissionQueryImpl(scopeId); } - @Override - public RolePermissionListResult newListResult() { - return new RolePermissionListResultImpl(); - } - @Override public RolePermission clone(RolePermission rolePermission) { return new RolePermissionImpl(rolePermission); diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionImplJpaRepository.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionImplJpaRepository.java index 28e6c5da932..dd3f1229ee5 100644 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionImplJpaRepository.java +++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionImplJpaRepository.java @@ -12,6 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.role.shiro; +import java.util.List; +import java.util.stream.Collectors; + +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaDelete; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Root; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.jpa.JpaAwareTxContext; import org.eclipse.kapua.commons.jpa.KapuaEntityJpaRepository; @@ -25,20 +34,12 @@ import org.eclipse.kapua.service.authorization.role.RolePermissionRepository; import org.eclipse.kapua.storage.TxContext; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import java.util.List; -import java.util.stream.Collectors; - public class RolePermissionImplJpaRepository extends KapuaEntityJpaRepository implements RolePermissionRepository { public RolePermissionImplJpaRepository(KapuaJpaRepositoryConfiguration configuration) { - super(RolePermissionImpl.class, RolePermission.TYPE, () -> new RolePermissionListResultImpl(), configuration); + super(RolePermissionImpl.class, RolePermission.TYPE, () -> new RolePermissionListResult(), configuration); } @Override @@ -70,7 +71,7 @@ public RolePermissionListResult deleteAllByDomainAndAction(TxContext tx, String deleteQuery.where(deleteRoot.get(RolePermissionImpl_.id).in(resultList.stream().map(r -> r.getId()).map(KapuaEid::parseKapuaId).collect(Collectors.toList()))); em.createQuery(deleteQuery).executeUpdate(); } - final RolePermissionListResultImpl res = new RolePermissionListResultImpl(); + final RolePermissionListResult res = new RolePermissionListResult(); res.addItems(resultList); return res; } diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionListResultImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionListResultImpl.java deleted file mode 100644 index 210f4d786ac..00000000000 --- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/role/shiro/RolePermissionListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.authorization.role.shiro; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.authorization.role.RolePermission; -import org.eclipse.kapua.service.authorization.role.RolePermissionListResult; - -/** - * {@link RolePermission} list result implementation. - * - * @since 1.0.0 - * - */ -public class RolePermissionListResultImpl extends KapuaListResultImpl implements RolePermissionListResult { - - private static final long serialVersionUID = -4732941050197499090L; -} diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImplTest.java index 46af59ccee6..7b5119fc23e 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/mfa/shiro/MfaOptionFactoryImplTest.java @@ -12,13 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.mfa.shiro; +import java.util.Date; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.commons.model.id.KapuaEid; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOption; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionCreator; -import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionListResult; import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionQuery; import org.junit.Assert; import org.junit.Before; @@ -26,9 +27,6 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class MfaOptionFactoryImplTest { @@ -42,8 +40,8 @@ public class MfaOptionFactoryImplTest { @Before public void initialize() { mfaOptionFactoryImpl = new MfaOptionFactoryImpl(); - scopeIds = new KapuaId[]{null, KapuaId.ONE}; - userIds = new KapuaEid[]{null, new KapuaEid()}; + scopeIds = new KapuaId[] { null, KapuaId.ONE }; + userIds = new KapuaEid[] { null, new KapuaEid() }; mfaOption = Mockito.mock(MfaOption.class); trustExpirationDate = new Date(); modifiedOn = new Date(); @@ -60,11 +58,6 @@ public void newCreatorScopeIdUserIdMfaSecretKeyParametersTest() { } } - @Test - public void newListResultTest() { - Assert.assertTrue("Instance of MfaOptionListResult expected.", mfaOptionFactoryImpl.newListResult() instanceof MfaOptionListResult); - } - @Test public void newEntityTest() { for (KapuaId scopeId : scopeIds) { diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImplTest.java index 0261f3eb3b0..e123066baee 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialFactoryImplTest.java @@ -12,24 +12,22 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.credential.shiro; +import java.util.Date; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.commons.model.id.KapuaEid; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; -import org.eclipse.kapua.service.authentication.credential.CredentialStatus; import org.eclipse.kapua.service.authentication.credential.Credential; -import org.eclipse.kapua.service.authentication.credential.CredentialQuery; import org.eclipse.kapua.service.authentication.credential.CredentialCreator; -import org.eclipse.kapua.service.authentication.credential.CredentialListResult; +import org.eclipse.kapua.service.authentication.credential.CredentialQuery; +import org.eclipse.kapua.service.authentication.credential.CredentialStatus; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class CredentialFactoryImplTest { @@ -46,12 +44,12 @@ public class CredentialFactoryImplTest { @Before public void initialize() { credentialFactoryImpl = new CredentialFactoryImpl(); - scopeIds = new KapuaId[]{null, KapuaId.ONE}; - userIds = new KapuaEid[]{null, new KapuaEid()}; - credentialKeys = new String[]{null, "", "!!credentialKey-1", "#1(credentialKey.,/Key)9--99", "!$$ 1-2 key//", "credential_K_ey(....)<00>"}; - credentialTypes = new String[] {null, "PASSWORD", "API_KEY", "JWT"}; - credentialStatuses = new CredentialStatus[]{null, CredentialStatus.ENABLED, CredentialStatus.DISABLED}; - dates = new Date[]{null, new Date()}; + scopeIds = new KapuaId[] { null, KapuaId.ONE }; + userIds = new KapuaEid[] { null, new KapuaEid() }; + credentialKeys = new String[] { null, "", "!!credentialKey-1", "#1(credentialKey.,/Key)9--99", "!$$ 1-2 key//", "credential_K_ey(....)<00>" }; + credentialTypes = new String[] { null, "PASSWORD", "API_KEY", "JWT" }; + credentialStatuses = new CredentialStatus[] { null, CredentialStatus.ENABLED, CredentialStatus.DISABLED }; + dates = new Date[] { null, new Date() }; credential = Mockito.mock(Credential.class); expirationDate = new Date(); modifiedOn = new Date(); @@ -80,11 +78,6 @@ public void newCreatorScopeIdUserIdMfaSecretKeyParametersTest() { } } - @Test - public void newListResultTest() { - Assert.assertTrue("True expected.", credentialFactoryImpl.newListResult() instanceof CredentialListResult); - } - @Test public void newEntityTest() { for (KapuaId scopeId : scopeIds) { diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImplTest.java index d1659e85aca..b3d5eb1b2fc 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authentication/token/shiro/AccessTokenFactoryImplTest.java @@ -12,24 +12,22 @@ *******************************************************************************/ package org.eclipse.kapua.service.authentication.token.shiro; +import java.util.Date; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.commons.model.id.KapuaEid; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authentication.token.AccessToken; +import org.eclipse.kapua.service.authentication.token.AccessTokenCreator; import org.eclipse.kapua.service.authentication.token.AccessTokenQuery; import org.eclipse.kapua.service.authentication.token.LoginInfo; -import org.eclipse.kapua.service.authentication.token.AccessTokenListResult; -import org.eclipse.kapua.service.authentication.token.AccessTokenCreator; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class AccessTokenFactoryImplTest { @@ -44,17 +42,17 @@ public class AccessTokenFactoryImplTest { @Before public void initialize() { accessTokenFactoryImpl = new AccessTokenFactoryImpl(); - scopeIds = new KapuaId[]{null, KapuaId.ONE}; - userIds = new KapuaEid[]{null, new KapuaEid()}; - tokenIds = new String[]{null, "", "!!token id-1", "#1(token.,/tokenID)9--99", "!$$ 1-2 id//", "to_ken_id(....)<00>"}; - refreshTokens = new String[]{null, "", "!!token refresh token-1", "#1(REfreSF.,/token_refresh)9--99", "!$$ 1-2 id//", "to_ken_refRESH token(....)<00>"}; - expiresOnDates = new Date[]{null, new Date()}; - refreshExpiresOnDates = new Date[]{null, new Date()}; + scopeIds = new KapuaId[] { null, KapuaId.ONE }; + userIds = new KapuaEid[] { null, new KapuaEid() }; + tokenIds = new String[] { null, "", "!!token id-1", "#1(token.,/tokenID)9--99", "!$$ 1-2 id//", "to_ken_id(....)<00>" }; + refreshTokens = new String[] { null, "", "!!token refresh token-1", "#1(REfreSF.,/token_refresh)9--99", "!$$ 1-2 id//", "to_ken_refRESH token(....)<00>" }; + expiresOnDates = new Date[] { null, new Date() }; + refreshExpiresOnDates = new Date[] { null, new Date() }; accessToken = Mockito.mock(AccessToken.class); modifiedOn = new Date(); createdOn = new Date(); invalidatedOn = new Date(); - tokenIdentifiers = new String[]{"a2fe104f-5d03-4a09-a28d-817ebbc85901", "8e075aeb-be2a-49a7-8dec-346760375d19", "e71b2f52-e02e-4e24-9147-96674e3bf599"}; + tokenIdentifiers = new String[] { "a2fe104f-5d03-4a09-a28d-817ebbc85901", "8e075aeb-be2a-49a7-8dec-346760375d19", "e71b2f52-e02e-4e24-9147-96674e3bf599" }; } @Test @@ -66,7 +64,8 @@ public void newCreatorMultipleParametersTest() { for (String refreshToken : refreshTokens) { for (Date refreshExpiresOnDate : refreshExpiresOnDates) { for (String tokenIdenfier : tokenIdentifiers) { - AccessTokenCreatorImpl accessTokenCreatorImpl = accessTokenFactoryImpl.newCreator(scopeId, userId, tokenId, expiresOnDate, refreshToken, refreshExpiresOnDate, tokenIdenfier); + AccessTokenCreatorImpl accessTokenCreatorImpl = accessTokenFactoryImpl.newCreator(scopeId, userId, tokenId, expiresOnDate, refreshToken, refreshExpiresOnDate, + tokenIdenfier); Assert.assertEquals("Expected and actual values should be the same.", scopeId, accessTokenCreatorImpl.getScopeId()); Assert.assertEquals("Expected and actual values should be the same.", userId, accessTokenCreatorImpl.getUserId()); Assert.assertEquals("Expected and actual values should be the same.", tokenId, accessTokenCreatorImpl.getTokenId()); @@ -107,11 +106,6 @@ public void newQueryTest() { } } - @Test - public void newListResultTest() { - Assert.assertTrue("True expected.", accessTokenFactoryImpl.newListResult() instanceof AccessTokenListResult); - } - @Test public void cloneTest() { Mockito.when(accessToken.getId()).thenReturn(KapuaId.ONE); diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImplTest.java index 2ce26e553a5..de5fdf1f83b 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessInfoFactoryImplTest.java @@ -12,12 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import java.util.Date; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.access.AccessInfo; import org.eclipse.kapua.service.authorization.access.AccessInfoCreator; -import org.eclipse.kapua.service.authorization.access.AccessInfoListResult; import org.eclipse.kapua.service.authorization.access.AccessInfoQuery; import org.junit.Assert; import org.junit.Before; @@ -25,17 +26,13 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class AccessInfoFactoryImplTest { AccessInfoFactoryImpl accessInfoFactoryImpl; KapuaId scopeId; AccessInfo accessInfo; - Date createdOn,modifiedOn; - + Date createdOn, modifiedOn; @Before public void initialize() { @@ -97,13 +94,6 @@ public void newQueryNullTest() { Assert.assertNull("Null expected.", accessInfoQuery.getScopeId()); } - @Test - public void newListResultTest() { - AccessInfoListResult accessInfoListResult = accessInfoFactoryImpl.newListResult(); - - Assert.assertTrue("True expected.", accessInfoListResult.isEmpty()); - } - @Test public void cloneTest() { AccessInfo resultAccessInfo = accessInfoFactoryImpl.clone(accessInfo); diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImplTest.java index a7654bd3539..c4ea95a3eb2 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionFactoryImplTest.java @@ -16,7 +16,6 @@ import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.access.AccessPermission; import org.eclipse.kapua.service.authorization.access.AccessPermissionCreator; -import org.eclipse.kapua.service.authorization.access.AccessPermissionListResult; import org.eclipse.kapua.service.authorization.access.AccessPermissionQuery; import org.junit.Assert; import org.junit.Before; @@ -24,7 +23,6 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; - @Category(JUnitTests.class) public class AccessPermissionFactoryImplTest { @@ -34,7 +32,7 @@ public class AccessPermissionFactoryImplTest { @Before public void initialize() { accessPermissionFactoryImpl = new AccessPermissionFactoryImpl(); - scopeIds = new KapuaId[]{null, KapuaId.ONE}; + scopeIds = new KapuaId[] { null, KapuaId.ONE }; } @Test @@ -58,11 +56,6 @@ public void newQueryTest() { } } - @Test - public void newListResultTest() { - Assert.assertTrue("True expected.", accessPermissionFactoryImpl.newListResult() instanceof AccessPermissionListResult); - } - @Test public void cloneTest() { AccessPermission accessPermission = Mockito.mock(AccessPermission.class); diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImplTest.java index 2e6eea3848f..187251c0ad8 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImplTest.java @@ -12,12 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.access.shiro; +import java.util.Date; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.access.AccessRole; import org.eclipse.kapua.service.authorization.access.AccessRoleCreator; -import org.eclipse.kapua.service.authorization.access.AccessRoleListResult; import org.eclipse.kapua.service.authorization.access.AccessRoleQuery; import org.junit.Assert; import org.junit.Before; @@ -25,9 +26,6 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class AccessRoleFactoryImplTest { @@ -85,12 +83,6 @@ public void newQueryNullTest() { Assert.assertNull("Null expected.", accessRoleQuery.getScopeId()); } - @Test - public void newListResultTest() { - AccessRoleListResult accessRoleListResult = accessRoleFactoryImpl.newListResult(); - Assert.assertTrue("True expected.", accessRoleListResult.isEmpty()); - } - @Test public void cloneTest() { accessRoleFactoryImpl.clone(accessRole); diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImplTest.java index 6399442db7a..83d88868642 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/domain/shiro/DomainFactoryImplTest.java @@ -12,13 +12,16 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.domain.shiro; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + import org.apache.commons.lang.NotImplementedException; import org.eclipse.kapua.model.domain.Actions; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.domain.Domain; import org.eclipse.kapua.service.authorization.domain.DomainCreator; -import org.eclipse.kapua.service.authorization.domain.DomainListResult; import org.eclipse.kapua.service.authorization.domain.DomainQuery; import org.junit.Assert; import org.junit.Before; @@ -26,11 +29,6 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - - @Category(JUnitTests.class) public class DomainFactoryImplTest { @@ -43,7 +41,8 @@ public void initialize() { @Test public void newCreatorNameParameterTest() { - String[] names = {"", " na123)(&*^&NAME <>", "Na-,,..,,Me name ---", "-&^454536 na___,,12 NAME name ", "! 2#@ na meNEMA 2323", "12&^%4 ,,,. '|<>*(", " ,,123name;;'", "12#name--765 ,.aaa!!#$%^<> "}; + String[] names = { "", " na123)(&*^&NAME <>", "Na-,,..,,Me name ---", "-&^454536 na___,,12 NAME name ", "! 2#@ na meNEMA 2323", "12&^%4 ,,,. '|<>*(", " ,,123name;;'", + "12#name--765 ,.aaa!!#$%^<> " }; for (String name : names) { DomainCreator domainCreator = domainFactoryImpl.newCreator(name); @@ -59,12 +58,6 @@ public void newCreatorNullNameParameterTest() { Assert.assertNull("Null expected.", domainCreator.getScopeId()); } - @Test - public void newListResultTest() { - DomainListResult domainListResult = domainFactoryImpl.newListResult(); - Assert.assertTrue("True expected.", domainListResult.isEmpty()); - } - @Test public void newQueryTest() { DomainQuery domainQuery = domainFactoryImpl.newQuery(KapuaId.ONE); diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImplTest.java index 75badcb4e9c..2615beda67f 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/group/shiro/GroupFactoryImplTest.java @@ -12,12 +12,13 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.group.shiro; +import java.util.Date; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.group.Group; import org.eclipse.kapua.service.authorization.group.GroupCreator; -import org.eclipse.kapua.service.authorization.group.GroupListResult; import org.eclipse.kapua.service.authorization.group.GroupQuery; import org.junit.Assert; import org.junit.Before; @@ -25,9 +26,6 @@ import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class GroupFactoryImplTest { @@ -41,7 +39,8 @@ public class GroupFactoryImplTest { public void initialize() { groupFactoryImpl = new GroupFactoryImpl(); scopeId = KapuaId.ONE; - names = new String[]{"", " na123)(&*^&NAME <>", "Na-,,..,,Me name ---", "-&^454536 na___,,12 NAME name ", "! 2#@ na meNEMA 2323", "12&^%4 ,,,. '|<>*(", " ,,123name;;'", "12#name--765 ,.aaa!!#$%^<> "}; + names = new String[] { "", " na123)(&*^&NAME <>", "Na-,,..,,Me name ---", "-&^454536 na___,,12 NAME name ", "! 2#@ na meNEMA 2323", "12&^%4 ,,,. '|<>*(", " ,,123name;;'", + "12#name--765 ,.aaa!!#$%^<> " }; group = Mockito.mock(Group.class); createdOn = new Date(); modifiedOn = new Date(); @@ -94,12 +93,6 @@ public void newEntityNullTest() { Assert.assertNull("Null expected.", group.getScopeId()); } - @Test - public void newListResultTest() { - GroupListResult groupListResult = groupFactoryImpl.newListResult(); - Assert.assertTrue("True expected.", groupListResult.isEmpty()); - } - @Test public void newQueryTest() { GroupQuery groupQuery = groupFactoryImpl.newQuery(scopeId); diff --git a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImplTest.java b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImplTest.java index 98b984f8866..b4fe45669e9 100644 --- a/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImplTest.java +++ b/service/security/shiro/src/test/java/org/eclipse/kapua/service/authorization/role/shiro/RoleFactoryImplTest.java @@ -12,22 +12,20 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.role.shiro; +import java.util.Date; + import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.qa.markers.junit.JUnitTests; import org.eclipse.kapua.service.authorization.role.Role; import org.eclipse.kapua.service.authorization.role.RoleCreator; -import org.eclipse.kapua.service.authorization.role.RoleQuery; -import org.eclipse.kapua.service.authorization.role.RoleListResult; import org.eclipse.kapua.service.authorization.role.RolePermission; +import org.eclipse.kapua.service.authorization.role.RoleQuery; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import java.util.Date; - - @Category(JUnitTests.class) public class RoleFactoryImplTest { @@ -91,12 +89,6 @@ public void newQueryNullTest() { Assert.assertNull("Null expected.", roleFactoryImpl.newQuery(null).getScopeId()); } - @Test - public void newListResultTest() { - Assert.assertTrue("True expected.", roleFactoryImpl.newListResult() instanceof RoleListResult); - Assert.assertTrue("True expected.", roleFactoryImpl.newListResult().isEmpty()); - } - @Test public void newRolePermissionTest() { Assert.assertTrue("True expected.", roleFactoryImpl.newRolePermission() instanceof RolePermission); diff --git a/service/security/test-steps/src/main/java/org/eclipse/kapua/service/authorization/steps/AuthorizationServiceSteps.java b/service/security/test-steps/src/main/java/org/eclipse/kapua/service/authorization/steps/AuthorizationServiceSteps.java index f015b1ed1b6..9092ef37565 100644 --- a/service/security/test-steps/src/main/java/org/eclipse/kapua/service/authorization/steps/AuthorizationServiceSteps.java +++ b/service/security/test-steps/src/main/java/org/eclipse/kapua/service/authorization/steps/AuthorizationServiceSteps.java @@ -12,14 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.authorization.steps; -import com.google.inject.Singleton; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.Scenario; -import io.cucumber.java.en.And; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.inject.Inject; + import org.eclipse.kapua.KapuaException; import org.eclipse.kapua.commons.security.KapuaSecurityUtils; import org.eclipse.kapua.locator.KapuaLocator; @@ -88,13 +89,15 @@ import org.eclipse.kapua.service.user.UserService; import org.junit.Assert; -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.inject.Singleton; + +import io.cucumber.java.After; +import io.cucumber.java.Before; +import io.cucumber.java.Scenario; +import io.cucumber.java.en.And; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; // Implementation of Gherkin steps used to test miscellaneous Shiro // authorization functionality. @@ -524,7 +527,6 @@ public void performRoleFactorySanityChecks() { Assert.assertNotNull(roleFactory.newEntity(SYS_SCOPE_ID)); Assert.assertNotNull(roleFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull(roleFactory.newQuery(SYS_SCOPE_ID)); - Assert.assertNotNull(roleFactory.newListResult()); Assert.assertNotNull(roleFactory.newRolePermission()); } @@ -533,7 +535,6 @@ public void performRolePermissionFactorySanityChecks() { Assert.assertNotNull(rolePermissionFactory.newEntity(SYS_SCOPE_ID)); Assert.assertNotNull(rolePermissionFactory.newCreator(SYS_SCOPE_ID)); Assert.assertNotNull(rolePermissionFactory.newQuery(SYS_SCOPE_ID)); - Assert.assertNotNull(rolePermissionFactory.newListResult()); } @Then("The role comparator does its job") @@ -1026,21 +1027,21 @@ public void createPermissionsForDomain(String permList) { Domain curDomain = (Domain) stepData.get(DOMAIN); for (String perm : tmpList) { switch (perm.trim()) { - case "read": - permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.read, currId)); - break; - case "write": - permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.write, currId)); - break; - case "delete": - permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.delete, currId)); - break; - case "connect": - permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.connect, currId)); - break; - case "execute": - permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.execute, currId)); - break; + case "read": + permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.read, currId)); + break; + case "write": + permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.write, currId)); + break; + case "delete": + permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.delete, currId)); + break; + case "connect": + permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.connect, currId)); + break; + case "execute": + permissions.add(permissionFactory.newPermission(curDomain.getDomain().getName(), Actions.execute, currId)); + break; } } // Make sure that there is at least one valid item @@ -1324,7 +1325,6 @@ public void accessInfoServiceSanityCheck() throws Exception { Assert.assertNotNull(accessInfoFactory.newCreator(getKapuaId())); Assert.assertNotNull(accessInfoFactory.newEntity(null)); Assert.assertNotNull(accessInfoFactory.newQuery(getKapuaId())); - Assert.assertNotNull(accessInfoFactory.newListResult()); AccessInfoCreator tmpCreator = accessInfoFactory.newCreator(getKapuaId()); Assert.assertNotNull(tmpCreator); AccessInfo tmpAccInfo = accessInfoFactory.newEntity(getKapuaId()); @@ -1342,7 +1342,6 @@ public void accessPermissionFactorySanityCheck() { Assert.assertNotNull(accessPermissionFactory.newEntity(null)); Assert.assertNotNull(accessPermissionFactory.newEntity(getKapuaId())); Assert.assertNotNull(accessPermissionFactory.newQuery(getKapuaId())); - Assert.assertNotNull(accessPermissionFactory.newListResult()); KapuaId tmpId = getKapuaId(); AccessPermissionCreator tmpCreator = accessPermissionFactory.newCreator(tmpId); Assert.assertNotNull(tmpCreator); @@ -1369,7 +1368,6 @@ public void accessRoleFactorySanityCheck() throws Exception { Assert.assertNotNull(accessRoleFactory.newCreator(getKapuaId())); Assert.assertNotNull(accessRoleFactory.newEntity(getKapuaId())); Assert.assertNotNull(accessRoleFactory.newQuery(getKapuaId())); - Assert.assertNotNull(accessRoleFactory.newListResult()); KapuaId tmpId = getKapuaId(); AccessRoleCreator tmpCreator = accessRoleFactory.newCreator(tmpId); Assert.assertNotNull(tmpCreator); diff --git a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagFactory.java b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagFactory.java index c8f36fb1aab..9f115487ef9 100644 --- a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagFactory.java +++ b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagFactory.java @@ -21,13 +21,15 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface TagFactory extends KapuaEntityFactory { +public interface TagFactory extends KapuaEntityFactory { /** * Instantiates a new {@link TagCreator}. * - * @param scopeId The scope {@link KapuaId} to set into the {@link TagCreator} - * @param name The name to set into the {@link TagCreator}. + * @param scopeId + * The scope {@link KapuaId} to set into the {@link TagCreator} + * @param name + * The name to set into the {@link TagCreator}. * @return The newly instantiated {@link TagCreator} * @since 1.0.0 */ diff --git a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagListResult.java b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagListResult.java index c8b50fe1832..d51c8dc1900 100644 --- a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagListResult.java +++ b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagListResult.java @@ -12,18 +12,20 @@ *******************************************************************************/ package org.eclipse.kapua.service.tag; -import org.eclipse.kapua.model.query.KapuaListResult; - import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.eclipse.kapua.model.query.KapuaListResult; + /** * {@link Tag} list result definition. * * @since 1.0.0 */ @XmlRootElement(name = "tags") -@XmlType(factoryClass = TagXmlRegistry.class, factoryMethod = "newTagListResult") -public interface TagListResult extends KapuaListResult { +@XmlType +public class TagListResult extends KapuaListResult { + + private static final long serialVersionUID = 791258978210911362L; } diff --git a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagXmlRegistry.java b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagXmlRegistry.java index e0934428188..c12356b4f6d 100644 --- a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagXmlRegistry.java +++ b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/TagXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.tag; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + @XmlRegistry public class TagXmlRegistry { @@ -39,15 +39,6 @@ public TagCreator newTagCreator() { return tagFactory.newCreator(null, null); } - /** - * Creates a new tag creator instance - * - * @return - */ - public TagListResult newTagListResult() { - return tagFactory.newListResult(); - } - public TagQuery newQuery() { return tagFactory.newQuery(null); } diff --git a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagFactoryImpl.java b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagFactoryImpl.java index 5931fd10e3f..49778c6df75 100644 --- a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagFactoryImpl.java +++ b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.tag.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.tag.Tag; import org.eclipse.kapua.service.tag.TagCreator; import org.eclipse.kapua.service.tag.TagFactory; -import org.eclipse.kapua.service.tag.TagListResult; import org.eclipse.kapua.service.tag.TagQuery; -import javax.inject.Singleton; - /** * {@link TagFactory} implementation. * @@ -44,11 +43,6 @@ public Tag newEntity(KapuaId scopeId) { return new TagImpl(scopeId); } - @Override - public TagListResult newListResult() { - return new TagListResultImpl(); - } - @Override public TagQuery newQuery(KapuaId scopeId) { return new TagQueryImpl(scopeId); diff --git a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagImplJpaRepository.java b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagImplJpaRepository.java index ee9965fb26a..5d370bd47d3 100644 --- a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagImplJpaRepository.java +++ b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagImplJpaRepository.java @@ -12,20 +12,21 @@ *******************************************************************************/ package org.eclipse.kapua.service.tag.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaNamedEntityJpaRepository; import org.eclipse.kapua.service.tag.Tag; import org.eclipse.kapua.service.tag.TagListResult; import org.eclipse.kapua.service.tag.TagRepository; -import javax.inject.Singleton; - @Singleton public class TagImplJpaRepository extends KapuaNamedEntityJpaRepository implements TagRepository { + public TagImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(TagImpl.class, Tag.TYPE, TagListResultImpl::new, jpaRepoConfig); + super(TagImpl.class, Tag.TYPE, TagListResult::new, jpaRepoConfig); } } diff --git a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagListResultImpl.java b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagListResultImpl.java deleted file mode 100644 index 3bbf92f544c..00000000000 --- a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagListResultImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.tag.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.tag.Tag; -import org.eclipse.kapua.service.tag.TagListResult; - -/** - * {@link TagListResult} implementation. - * - * @since 1.0.0 - */ -public class TagListResultImpl extends KapuaListResultImpl implements TagListResult { - - private static final long serialVersionUID = 791258978210911362L; -} diff --git a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserFactory.java b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserFactory.java index 763f88f819b..ad6f5722827 100644 --- a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserFactory.java +++ b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserFactory.java @@ -21,13 +21,15 @@ * @see org.eclipse.kapua.model.KapuaEntityFactory * @since 1.0.0 */ -public interface UserFactory extends KapuaEntityFactory { +public interface UserFactory extends KapuaEntityFactory { /** * Instantiates a new {@link UserCreator} * - * @param scopedId The scope {@link KapuaId} to set into the {@link UserCreator}. - * @param name The name to set into the {@link UserCreator}. + * @param scopedId + * The scope {@link KapuaId} to set into the {@link UserCreator}. + * @param name + * The name to set into the {@link UserCreator}. * @return The newly instantiated {@link UserCreator} * @since 1.0.0 */ diff --git a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserListResult.java b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserListResult.java index 37dc26c836a..3f92b0e8099 100644 --- a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserListResult.java +++ b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserListResult.java @@ -23,7 +23,9 @@ * @since 1.0 */ @XmlRootElement(name = "users") -@XmlType(factoryClass = UserXmlRegistry.class, factoryMethod = "newUserListResult") -public interface UserListResult extends KapuaListResult { +@XmlType +public class UserListResult extends KapuaListResult { + + private static final long serialVersionUID = 2231053707705207563L; } diff --git a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserXmlRegistry.java b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserXmlRegistry.java index a9b33088658..04d48cb787c 100644 --- a/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserXmlRegistry.java +++ b/service/user/api/src/main/java/org/eclipse/kapua/service/user/UserXmlRegistry.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.kapua.service.user; -import org.eclipse.kapua.locator.KapuaLocator; - import javax.xml.bind.annotation.XmlRegistry; +import org.eclipse.kapua.locator.KapuaLocator; + /** * {@link User} xml factory class * @@ -44,15 +44,6 @@ public UserCreator newUserCreator() { return userFactory.newCreator(null, null); } - /** - * Creates new user list result - * - * @return - */ - public UserListResult newUserListResult() { - return userFactory.newListResult(); - } - public UserQuery newQuery() { return userFactory.newQuery(null); } diff --git a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserFactoryImpl.java b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserFactoryImpl.java index e31df74a8dd..2d04f102a5f 100644 --- a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserFactoryImpl.java +++ b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserFactoryImpl.java @@ -12,16 +12,15 @@ *******************************************************************************/ package org.eclipse.kapua.service.user.internal; +import javax.inject.Singleton; + import org.eclipse.kapua.KapuaEntityCloneException; import org.eclipse.kapua.model.id.KapuaId; import org.eclipse.kapua.service.user.User; import org.eclipse.kapua.service.user.UserCreator; import org.eclipse.kapua.service.user.UserFactory; -import org.eclipse.kapua.service.user.UserListResult; import org.eclipse.kapua.service.user.UserQuery; -import javax.inject.Singleton; - /** * {@link UserFactory} implementation. * @@ -44,11 +43,6 @@ public UserQuery newQuery(KapuaId scopeId) { return new UserQueryImpl(scopeId); } - @Override - public UserListResult newListResult() { - return new UserListResultImpl(); - } - @Override public User newEntity(KapuaId scopeId) { return new UserImpl(scopeId); diff --git a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserImplJpaRepository.java b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserImplJpaRepository.java index 4b5f2c2de8c..0e88bb9457c 100644 --- a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserImplJpaRepository.java +++ b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserImplJpaRepository.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.kapua.service.user.internal; +import java.util.Optional; + import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration; import org.eclipse.kapua.commons.jpa.KapuaNamedEntityJpaRepository; import org.eclipse.kapua.model.id.KapuaId; @@ -21,13 +23,12 @@ import org.eclipse.kapua.service.user.UserRepository; import org.eclipse.kapua.storage.TxContext; -import java.util.Optional; - public class UserImplJpaRepository extends KapuaNamedEntityJpaRepository implements UserRepository { + public UserImplJpaRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) { - super(UserImpl.class, User.TYPE, () -> new UserListResultImpl(), jpaRepoConfig); + super(UserImpl.class, User.TYPE, () -> new UserListResult(), jpaRepoConfig); } @Override diff --git a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserListResultImpl.java b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserListResultImpl.java deleted file mode 100644 index ac333e8b44e..00000000000 --- a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserListResultImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Eurotech - initial API and implementation - *******************************************************************************/ -package org.eclipse.kapua.service.user.internal; - -import org.eclipse.kapua.commons.model.query.KapuaListResultImpl; -import org.eclipse.kapua.service.user.User; -import org.eclipse.kapua.service.user.UserListResult; - -/** - * User list result implementation. - * - * @since 1.0 - * - */ -public class UserListResultImpl extends KapuaListResultImpl implements UserListResult { - - private static final long serialVersionUID = 2231053707705207563L; -} diff --git a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppAssetKapuaKura.java b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppAssetKapuaKura.java index 87059b422ec..c81cbf29e6f 100644 --- a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppAssetKapuaKura.java +++ b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppAssetKapuaKura.java @@ -12,8 +12,14 @@ *******************************************************************************/ package org.eclipse.kapua.translator.kapua.kura; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.util.Date; + +import javax.inject.Inject; +import javax.xml.bind.JAXBException; + import org.eclipse.kapua.service.device.call.kura.model.asset.AssetMetrics; import org.eclipse.kapua.service.device.call.kura.model.asset.KuraAsset; import org.eclipse.kapua.service.device.call.kura.model.asset.KuraAssetChannel; @@ -30,12 +36,8 @@ import org.eclipse.kapua.translator.exception.InvalidPayloadException; import org.xml.sax.SAXException; -import javax.inject.Inject; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.util.Date; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.ObjectMapper; /** * {@link org.eclipse.kapua.translator.Translator} implementation from {@link AssetRequestMessage} to {@link KuraRequestMessage} @@ -79,7 +81,7 @@ protected KuraRequestPayload translatePayload(AssetRequestPayload kapuaPayload) try { DeviceAssets deviceAssets; try { - deviceAssets = kapuaPayload.getDeviceAssets().orElse(deviceAssetFactory.newAssetListResult()); + deviceAssets = kapuaPayload.getDeviceAssets().orElse(new DeviceAssets()); } catch (UnsupportedEncodingException | JAXBException | SAXException e) { throw new InvalidPayloadException(e, kapuaPayload); } diff --git a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppAssetKuraKapua.java b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppAssetKuraKapua.java index 5daa8174bfa..cc9102aec9f 100644 --- a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppAssetKuraKapua.java +++ b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppAssetKuraKapua.java @@ -76,7 +76,7 @@ protected AssetResponsePayload translatePayload(KuraResponsePayload kuraResponse ObjectMapper mapper = new ObjectMapper(); JsonNode jsonNode = mapper.readTree(kuraResponsePayload.getBody()); - DeviceAssets deviceAssets = deviceAssetFactory.newAssetListResult(); + DeviceAssets deviceAssets = new DeviceAssets(); KuraAssets kuraAssets = KuraAssets.readJsonNode(jsonNode); kuraAssets.getAssets().forEach(kuraAsset -> { diff --git a/transport/mqtt/src/main/java/org/eclipse/kapua/transport/mqtt/MqttResponseTimeoutTimer.java b/transport/mqtt/src/main/java/org/eclipse/kapua/transport/mqtt/MqttResponseTimeoutTimer.java index 0a653270e07..12e96110102 100644 --- a/transport/mqtt/src/main/java/org/eclipse/kapua/transport/mqtt/MqttResponseTimeoutTimer.java +++ b/transport/mqtt/src/main/java/org/eclipse/kapua/transport/mqtt/MqttResponseTimeoutTimer.java @@ -12,10 +12,11 @@ *******************************************************************************/ package org.eclipse.kapua.transport.mqtt; -import javax.validation.constraints.NotNull; import java.util.Timer; import java.util.TimerTask; +import javax.validation.constraints.NotNull; + /** * The {@link Timer} to handle the timeout of {@link MqttResponseCallback}. * @@ -30,9 +31,12 @@ public class MqttResponseTimeoutTimer extends Timer { /** * Starts a {@link Timer} at the given timeout and runs {@link TimeoutTimerTask} when timeout expires. * - * @param clientId The clientId of the {@link MqttClient}. Used to set the {@link Timer} name. - * @param mqttClientCallback The {@link MqttResponseCallback} on which to wait. - * @param timeout The timeout of the waiting. + * @param clientId + * The clientId of the {@link MqttClient}. Used to set the {@link Timer} name. + * @param mqttClientCallback + * The {@link MqttResponseCallback} on which to wait. + * @param timeout + * The timeout of the waiting. * @since 1.0.0 */ public MqttResponseTimeoutTimer(@NotNull String clientId, @NotNull MqttResponseCallback mqttClientCallback, long timeout) { @@ -48,7 +52,8 @@ public MqttResponseTimeoutTimer(@NotNull String clientId, @NotNull MqttResponseC * * @since 1.0.0 */ - private class TimeoutTimerTask extends TimerTask { + public class TimeoutTimerTask extends TimerTask { + @Override public void run() { synchronized (mqttResponseCallback) {