Skip to content

Commit

Permalink
⚰️ removing no longer needed factory references
Browse files Browse the repository at this point in the history
Signed-off-by: dseurotech <davide.salvador@eurotech.com>
  • Loading branch information
dseurotech committed Jan 31, 2025
1 parent 27b04d1 commit 9052f2e
Show file tree
Hide file tree
Showing 40 changed files with 8 additions and 172 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ public Collection<Class<?>> getClasses() {
final Set<Class<?>> excludedXmlSerializables = serializablesByValidity.get(false);
final Set<Class<?>> validXmlSerializables = serializablesByValidity.get(true);
configurationPrinter.withTitle("Kapua XmlSerializable Configuration");
// if (configurationPrinter.getParentLogger().isDebugEnabled()) {
// Printing like this is highly verbose
configurationPrinter.logSections("Discovered XmlSerializable Classes", validXmlSerializables.stream().map(Class::getName).collect(Collectors.toList()));
configurationPrinter.logSections("Discovered but Excluded XmlSerializable Classes", excludedXmlSerializables.stream().map(Class::getName).collect(Collectors.toList()));
// } else {
// configurationPrinter.addParameter("Discovered XmlSerializable Classes", validXmlSerializables.size());
// configurationPrinter.addParameter("Discovered but Excluded XmlSerializable Classes", excludedXmlSerializables.size());
// }
if (configurationPrinter.getParentLogger().isDebugEnabled()) {
// Printing like this is highly verbose
configurationPrinter.logSections("Discovered XmlSerializable Classes", validXmlSerializables.stream().map(Class::getName).collect(Collectors.toList()));
configurationPrinter.logSections("Discovered but Excluded XmlSerializable Classes", excludedXmlSerializables.stream().map(Class::getName).collect(Collectors.toList()));
} else {
configurationPrinter.addParameter("Discovered XmlSerializable Classes", validXmlSerializables.size());
configurationPrinter.addParameter("Discovered but Excluded XmlSerializable Classes", excludedXmlSerializables.size());
}
// Print it!
configurationPrinter.printLog();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.eclipse.kapua.service.authentication.credential.CredentialFactory;
import org.eclipse.kapua.service.authentication.credential.CredentialStatus;
import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionCreator;
import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionFactory;

import com.extjs.gxt.ui.client.Style.SortDir;
import com.extjs.gxt.ui.client.data.BaseModel;
Expand All @@ -46,7 +45,6 @@ public class GwtKapuaAuthenticationModelConverter {
// Get Services
private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();
private static final CredentialFactory CREDENTIAL_FACTORY = LOCATOR.getFactory(CredentialFactory.class);
private static final MfaOptionFactory MFA_OPTION_FACTORY = LOCATOR.getFactory(MfaOptionFactory.class);

private GwtKapuaAuthenticationModelConverter() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.eclipse.kapua.service.authorization.access.AccessPermission;
import org.eclipse.kapua.service.authorization.access.AccessPermissionAttributes;
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.AccessPermissionService;
import org.eclipse.kapua.service.authorization.group.Group;
Expand All @@ -63,7 +62,6 @@ public class GwtAccessPermissionServiceImpl extends KapuaRemoteServiceServlet im
private static final AccessInfoService ACCESS_INFO_SERVICE = LOCATOR.getService(AccessInfoService.class);

private static final AccessPermissionService ACCESS_PERMISSION_SERVICE = LOCATOR.getService(AccessPermissionService.class);
private static final AccessPermissionFactory ACCESS_PERMISSION_FACTORY = LOCATOR.getFactory(AccessPermissionFactory.class);

private static final AccountService ACCOUNT_SERVICE = LOCATOR.getService(AccountService.class);
private static final UserService USER_SERVICE = LOCATOR.getService(UserService.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.eclipse.kapua.service.authorization.access.AccessRole;
import org.eclipse.kapua.service.authorization.access.AccessRoleAttributes;
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.AccessRoleService;
import org.eclipse.kapua.service.authorization.role.Role;
Expand Down Expand Up @@ -112,7 +111,6 @@ public PagingLoadResult<GwtAccessRole> findByUserId(PagingLoadConfig loadConfig,
RoleService roleService = locator.getService(RoleService.class);
AccessInfoService accessInfoService = locator.getService(AccessInfoService.class);
AccessRoleService accessRoleService = locator.getService(AccessRoleService.class);
AccessRoleFactory accessRoleFactory = locator.getFactory(AccessRoleFactory.class);
final UserService userService = locator.getService(UserService.class);

final KapuaId scopeId = GwtKapuaCommonsModelConverter.convertKapuaId(scopeShortId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.model.query.KapuaQuery;
import org.eclipse.kapua.service.authorization.domain.Domain;
import org.eclipse.kapua.service.authorization.domain.DomainFactory;
import org.eclipse.kapua.service.authorization.domain.DomainListResult;
import org.eclipse.kapua.service.authorization.domain.DomainRegistryService;

Expand All @@ -38,7 +37,6 @@ public class GwtDomainRegistryServiceImpl extends KapuaRemoteServiceServlet impl

private final KapuaLocator locator = KapuaLocator.getInstance();
private final DomainRegistryService domainRegistryService = locator.getService(DomainRegistryService.class);
private final DomainFactory domainFactory = locator.getFactory(DomainFactory.class);

@Override
public List<GwtDomain> findAll() throws GwtKapuaException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@
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 org.eclipse.kapua.service.authorization.group.GroupService;
import org.eclipse.kapua.service.user.User;
import org.eclipse.kapua.service.user.UserFactory;
import org.eclipse.kapua.service.user.UserListResult;
import org.eclipse.kapua.service.user.UserQuery;
import org.eclipse.kapua.service.user.UserService;
Expand All @@ -59,10 +57,8 @@ public class GwtGroupServiceImpl extends KapuaRemoteServiceServlet implements Gw
private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();

private static final GroupService GROUP_SERVICE = LOCATOR.getService(GroupService.class);
private static final GroupFactory GROUP_FACTORY = LOCATOR.getFactory(GroupFactory.class);

private static final UserService USER_SERVICE = LOCATOR.getService(UserService.class);
private static final UserFactory USER_FACTORY = LOCATOR.getFactory(UserFactory.class);

private static final String ENTITY_INFO = "entityInfo";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,15 @@
import org.eclipse.kapua.service.authorization.group.GroupService;
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.RolePermissionAttributes;
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.RolePermissionService;
import org.eclipse.kapua.service.authorization.role.RoleQuery;
import org.eclipse.kapua.service.authorization.role.RoleService;
import org.eclipse.kapua.service.user.User;
import org.eclipse.kapua.service.user.UserFactory;
import org.eclipse.kapua.service.user.UserListResult;
import org.eclipse.kapua.service.user.UserQuery;
import org.eclipse.kapua.service.user.UserService;
Expand All @@ -80,13 +77,10 @@ public class GwtRoleServiceImpl extends KapuaRemoteServiceServlet implements Gwt
private static final AccountService ACCOUNT_SERVICE = LOCATOR.getService(AccountService.class);

private static final RoleService ROLE_SERVICE = LOCATOR.getService(RoleService.class);
private static final RoleFactory ROLE_FACTORY = LOCATOR.getFactory(RoleFactory.class);

private static final RolePermissionService ROLE_PERMISSION_SERVICE = LOCATOR.getService(RolePermissionService.class);
private static final RolePermissionFactory ROLE_PERMISSION_FACTORY = LOCATOR.getFactory(RolePermissionFactory.class);

private static final UserService USER_SERVICE = LOCATOR.getService(UserService.class);
private static final UserFactory USER_FACTORY = LOCATOR.getFactory(UserFactory.class);

private static final GroupService GROUP_SERVICE = LOCATOR.getService(GroupService.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,11 @@
import org.eclipse.kapua.model.query.predicate.AndPredicate;
import org.eclipse.kapua.model.query.predicate.AttributePredicate.Operator;
import org.eclipse.kapua.service.authorization.access.AccessInfoCreator;
import org.eclipse.kapua.service.authorization.access.AccessInfoFactory;
import org.eclipse.kapua.service.authorization.access.AccessPermissionCreator;
import org.eclipse.kapua.service.authorization.access.AccessPermissionFactory;
import org.eclipse.kapua.service.authorization.access.AccessRoleCreator;
import org.eclipse.kapua.service.authorization.access.AccessRoleFactory;
import org.eclipse.kapua.service.authorization.domain.DomainFactory;
import org.eclipse.kapua.service.authorization.domain.DomainListResult;
import org.eclipse.kapua.service.authorization.domain.DomainRegistryService;
import org.eclipse.kapua.service.authorization.group.GroupAttributes;
import org.eclipse.kapua.service.authorization.group.GroupFactory;
import org.eclipse.kapua.service.authorization.group.GroupQuery;
import org.eclipse.kapua.service.authorization.permission.Permission;
import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
Expand All @@ -74,16 +69,12 @@ public class GwtKapuaAuthorizationModelConverter {
private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();

private static final DomainRegistryService DOMAIN_REGISTRY_SERVICE = LOCATOR.getService(DomainRegistryService.class);
private static final DomainFactory DOMAIN_FACTORY = LOCATOR.getFactory(DomainFactory.class);

private GwtKapuaAuthorizationModelConverter() {
}

public static GroupQuery convertGroupQuery(PagingLoadConfig loadConfig,
GwtGroupQuery gwtGroupQuery) {
KapuaLocator locator = KapuaLocator.getInstance();
GroupFactory groupFactory = locator.getFactory(GroupFactory.class);

GroupQuery query = new GroupQuery(GwtKapuaCommonsModelConverter.convertKapuaId(gwtGroupQuery.getScopeId()));

AndPredicate predicate = query.andPredicate();
Expand Down Expand Up @@ -121,10 +112,6 @@ public static GroupQuery convertGroupQuery(PagingLoadConfig loadConfig,
*/
public static RoleQuery convertRoleQuery(PagingLoadConfig loadConfig, GwtRoleQuery gwtRoleQuery) {

// Get Services
KapuaLocator locator = KapuaLocator.getInstance();
RoleFactory roleFactory = locator.getFactory(RoleFactory.class);

// Convert query
RoleQuery query = new RoleQuery(GwtKapuaCommonsModelConverter.convertKapuaId(gwtRoleQuery.getScopeId()));

Expand Down Expand Up @@ -209,10 +196,6 @@ public static Role convertRole(GwtRole gwtRole) throws KapuaException {
*/
public static RoleCreator convertRoleCreator(GwtRoleCreator gwtRoleCreator) throws KapuaException {

// Get Services
KapuaLocator locator = KapuaLocator.getInstance();
RoleFactory roleFactory = locator.getFactory(RoleFactory.class);

// Convert scopeId
KapuaId scopeId = GwtKapuaCommonsModelConverter.convertKapuaId(gwtRoleCreator.getScopeId());
RoleCreator roleCreator = new RoleCreator(scopeId);
Expand Down Expand Up @@ -244,10 +227,6 @@ public static RoleCreator convertRoleCreator(GwtRoleCreator gwtRoleCreator) thro
*/
public static AccessRoleCreator convertAccessRoleCreator(GwtAccessRoleCreator gwtAccessRoleCreator) {

// Get Services
KapuaLocator locator = KapuaLocator.getInstance();
AccessRoleFactory accessRoleFactory = locator.getFactory(AccessRoleFactory.class);

// Convert scopeId
KapuaId scopeId = GwtKapuaCommonsModelConverter.convertKapuaId(gwtAccessRoleCreator.getScopeId());
AccessRoleCreator accessRoleCreator = new AccessRoleCreator(scopeId);
Expand All @@ -271,10 +250,6 @@ public static AccessRoleCreator convertAccessRoleCreator(GwtAccessRoleCreator gw
*/
public static AccessPermissionCreator convertAccessPermissionCreator(GwtAccessPermissionCreator gwtAccessPermissionCreator) throws KapuaException {

// Get Services
KapuaLocator locator = KapuaLocator.getInstance();
AccessPermissionFactory accessPermissionFactory = locator.getFactory(AccessPermissionFactory.class);

// Convert scopeId
KapuaId scopeId = GwtKapuaCommonsModelConverter.convertKapuaId(gwtAccessPermissionCreator.getScopeId());
AccessPermissionCreator accessPermissionCreator = new AccessPermissionCreator(scopeId);
Expand All @@ -289,10 +264,6 @@ public static AccessPermissionCreator convertAccessPermissionCreator(GwtAccessPe
}

public static AccessInfoCreator convertAccessInfoCreator(GwtAccessInfoCreator gwtAccessInfoCreator) {
// Get Services
KapuaLocator locator = KapuaLocator.getInstance();
AccessInfoFactory accessInfoFactory = locator.getFactory(AccessInfoFactory.class);

// Convert scopeId
KapuaId scopeId = GwtKapuaCommonsModelConverter.convertKapuaId(gwtAccessInfoCreator.getScopeId());
AccessInfoCreator accessInfoCreator = new AccessInfoCreator(scopeId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.service.certificate.info.CertificateInfo;
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 org.eclipse.kapua.service.certificate.info.CertificateInfoService;
Expand All @@ -39,7 +38,6 @@ public class GwtCertificateInfoServiceImpl extends KapuaRemoteServiceServlet imp
private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();

private static final CertificateInfoService CERTIFICATE_INFO_SERVICE = LOCATOR.getService(CertificateInfoService.class);
private static final CertificateInfoFactory CERTIFICATE_INFO_FACTORY = LOCATOR.getFactory(CertificateInfoFactory.class);

@Override
public List<GwtCertificateInfo> findAll(String scopeIdString) throws GwtKapuaException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,9 @@
import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.model.type.ObjectTypeConverter;
import org.eclipse.kapua.service.datastore.ChannelInfoFactory;
import org.eclipse.kapua.service.datastore.ChannelInfoRegistryService;
import org.eclipse.kapua.service.datastore.ClientInfoFactory;
import org.eclipse.kapua.service.datastore.ClientInfoRegistryService;
import org.eclipse.kapua.service.datastore.MessageStoreFactory;
import org.eclipse.kapua.service.datastore.MessageStoreService;
import org.eclipse.kapua.service.datastore.MetricInfoFactory;
import org.eclipse.kapua.service.datastore.MetricInfoRegistryService;
import org.eclipse.kapua.service.datastore.internal.model.query.predicate.ChannelMatchPredicateImpl;
import org.eclipse.kapua.service.datastore.model.ChannelInfo;
Expand Down Expand Up @@ -96,11 +92,6 @@ public class GwtDataServiceImpl extends KapuaRemoteServiceServlet implements Gwt

private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();

private static final ChannelInfoFactory CHANNEL_INFO_FACTORY = LOCATOR.getFactory(ChannelInfoFactory.class);
private static final ClientInfoFactory CLIENT_INFO_FACTORY = LOCATOR.getFactory(ClientInfoFactory.class);
private static final MessageStoreFactory MESSAGE_STORE_FACTORY = LOCATOR.getFactory(MessageStoreFactory.class);
private static final MetricInfoFactory METRIC_INFO_FACTORY = LOCATOR.getFactory(MetricInfoFactory.class);

private static final DatastorePredicateFactory DATASTORE_PREDICATE_FACTORY = LOCATOR.getFactory(DatastorePredicateFactory.class);

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.eclipse.kapua.app.console.module.api.shared.util.GwtKapuaCommonsModelConverter;
import org.eclipse.kapua.app.console.module.data.shared.util.KapuaGwtDataModelConverter;
import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.service.datastore.MessageStoreFactory;
import org.eclipse.kapua.service.datastore.MessageStoreService;
import org.eclipse.kapua.service.datastore.model.DatastoreMessage;
import org.eclipse.kapua.service.datastore.model.MessageListResult;
Expand All @@ -52,8 +51,6 @@ public class DataExporterServlet extends HttpServlet {

private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();

private static final MessageStoreFactory MESSAGE_STORE_FACTORY = LOCATOR.getFactory(MessageStoreFactory.class);

private static final DatastorePredicateFactory DATASTORE_PREDICATE_FACTORY = LOCATOR.getFactory(DatastorePredicateFactory.class);

private static final MessageStoreService MESSAGE_STORE_SERVICE = LOCATOR.getService(MessageStoreService.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,12 @@

import org.eclipse.kapua.app.console.module.api.shared.util.GwtKapuaCommonsModelConverter;
import org.eclipse.kapua.app.console.module.data.shared.model.GwtDataChannelInfoQuery;
import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.service.datastore.ChannelInfoFactory;
import org.eclipse.kapua.service.datastore.model.query.ChannelInfoQuery;

import com.extjs.gxt.ui.client.data.PagingLoadConfig;

public class GwtKapuaDataModelConverter {

private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();

private static final ChannelInfoFactory CHANNEL_INFO_FACTORY = LOCATOR.getFactory(ChannelInfoFactory.class);

private GwtKapuaDataModelConverter() {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionQuery;
import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionService;
import org.eclipse.kapua.service.user.User;
import org.eclipse.kapua.service.user.UserFactory;
import org.eclipse.kapua.service.user.UserListResult;
import org.eclipse.kapua.service.user.UserQuery;
import org.eclipse.kapua.service.user.UserService;
Expand All @@ -67,7 +66,6 @@ public class GwtDeviceConnectionServiceImpl extends KapuaRemoteServiceServlet im

private static final PermissionFactory PERMISSION_FACTORY = LOCATOR.getFactory(PermissionFactory.class);
private static final UserService USER_SERVICE = LOCATOR.getService(UserService.class);
private static final UserFactory USER_FACTORY = LOCATOR.getFactory(UserFactory.class);

private static final String CONNECTION_INFO = "connectionInfo";
private static final String CONNECTION_USER_COUPLING_MODE_INFO = "connectionUserCouplingModeInfo";
Expand Down
Loading

0 comments on commit 9052f2e

Please sign in to comment.