ALTERNATIVES_AES_CIPHERS_ENCRYPT = new HashMap<>();
-
- static {
- String defaultSecretKey = SECRET_KEY_LEGACY;
-
- if (!Strings.isNullOrEmpty(SECRET_KEY)) {
- defaultSecretKey = SECRET_KEY;
- }
-
- if (("changeMePlease!!".equals(defaultSecretKey) ||
- "rv;ipse329183!@#".equals(defaultSecretKey)) &&
- SECRET_KEY_ENFORCE) {
- throw new DefaultSecretKeyDetectedRuntimeException(defaultSecretKey);
- }
-
- Key aesKey = new SecretKeySpec(defaultSecretKey.getBytes(), AES_ALGORITHM);
-
- try {
- DEFAULT_AES_CIPHER_DECRYPT = Cipher.getInstance(AES_ALGORITHM);
- DEFAULT_AES_CIPHER_DECRYPT.init(Cipher.DECRYPT_MODE, aesKey);
-
- DEFAULT_AES_CIPHER_ENCRYPT = Cipher.getInstance(AES_ALGORITHM);
- DEFAULT_AES_CIPHER_ENCRYPT.init(Cipher.ENCRYPT_MODE, aesKey);
- } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
- throw new AlgorihmNotAvailableRuntimeException(e, AES_ALGORITHM);
- } catch (InvalidKeyException e) {
- throw new InvalidSecretKeyRuntimeException(e, AES_ALGORITHM, defaultSecretKey);
- }
- }
-
- /**
- * Constructor.
- *
- * @since 1.0.0
- */
- private CryptoUtil() {
- }
- // SHA-1
+public interface CryptoUtil {
/**
* Evaluates the SHA-1 hash for the provided String
*
@@ -104,12 +33,7 @@ private CryptoUtil() {
* @see MessageDigest
* @since 1.0.0
*/
- public static String sha1Hash(@NotNull String value) throws NoSuchAlgorithmException {
- MessageDigest md = MessageDigest.getInstance("SHA-1");
- byte[] encodedBytes = md.digest(value.getBytes(StandardCharsets.UTF_8));
- return DatatypeConverter.printBase64Binary(encodedBytes);
- }
- // AES
+ String sha1Hash(@NotNull String value) throws NoSuchAlgorithmException;
/**
* Decrypts an AES-encrypted value. It uses {@link CryptoSettingKeys#CRYPTO_SECRET_KEY} to decrypt the value.
@@ -117,12 +41,10 @@ public static String sha1Hash(@NotNull String value) throws NoSuchAlgorithmExcep
* @param value The value to decrypt.
* @return The decrypted value.
* @throws AesDecryptionException When an error occurs when decrypting.
- * @see #decryptAes(String, Cipher)
+ * @see CryptoUtilImpl#decryptAes(String, Cipher)
* @since 2.0.0
*/
- public static String decryptAes(@NotNull String value) throws AesDecryptionException {
- return decryptAes(value, DEFAULT_AES_CIPHER_DECRYPT);
- }
+ String decryptAes(@NotNull String value) throws AesDecryptionException;
/**
* Decrpts an AES-encrypted value. It uses {@link CryptoSettingKeys#CRYPTO_SECRET_KEY} to decrypt the value.
@@ -131,14 +53,10 @@ public static String decryptAes(@NotNull String value) throws AesDecryptionExcep
* @param alternativeSecretKey An externally provided secret key.
* @return The decrypted value.
* @throws AesDecryptionException When an error occurs when decrypting.
- * @see #decryptAes(String, Cipher)
+ * @see CryptoUtilImpl#decryptAes(String, Cipher)
* @since 2.0.0
*/
- public static String decryptAes(@NotNull String value, @NotNull String alternativeSecretKey) throws AesDecryptionException {
- Cipher decryptCipher = getDecryptCipherForKey(alternativeSecretKey);
-
- return decryptAes(value, decryptCipher);
- }
+ String decryptAes(@NotNull String value, @NotNull String alternativeSecretKey) throws AesDecryptionException;
/**
* Encrypts a value. It uses {@link CryptoSettingKeys#CRYPTO_SECRET_KEY} to encrypt the value.
@@ -149,9 +67,7 @@ public static String decryptAes(@NotNull String value, @NotNull String alternati
* @see Cipher#doFinal()
* @since 2.0.0
*/
- public static String encryptAes(@NotNull String value) throws AesEncryptionException {
- return encryptAes(value, DEFAULT_AES_CIPHER_ENCRYPT);
- }
+ String encryptAes(@NotNull String value) throws AesEncryptionException;
/**
* Encrypts a value. It uses {@link CryptoSettingKeys#CRYPTO_SECRET_KEY} to encrypt the value.
@@ -163,12 +79,7 @@ public static String encryptAes(@NotNull String value) throws AesEncryptionExcep
* @see Cipher#doFinal()
* @since 2.0.0
*/
- public static String encryptAes(@NotNull String value, @NotNull String alternativeSecretKey) throws AesEncryptionException {
- Cipher encryptCipher = getEncryptCipherForKey(alternativeSecretKey);
-
- return encryptAes(value, encryptCipher);
- }
- // Base 64
+ String encryptAes(@NotNull String value, @NotNull String alternativeSecretKey) throws AesEncryptionException;
/**
* Decodes the given Base64 {@link String} value in a {@link String}.
@@ -177,10 +88,7 @@ public static String encryptAes(@NotNull String value, @NotNull String alternati
* @return The decoded {@link String} value.
* @since 1.0.0
*/
- public static String decodeBase64(@NotNull String value) {
- byte[] decodedBytes = DatatypeConverter.parseBase64Binary(value);
- return new String(decodedBytes, StandardCharsets.UTF_8);
- }
+ String decodeBase64(@NotNull String value);
/**
* Encodes the given {@link String} value in a {@link Base64} format.
@@ -189,97 +97,5 @@ public static String decodeBase64(@NotNull String value) {
* @return The encoded {@link Base64} value.
* @since 1.0.0
*/
- public static String encodeBase64(@NotNull String value) {
- byte[] bytesValue = value.getBytes(StandardCharsets.UTF_8);
- return DatatypeConverter.printBase64Binary(bytesValue);
- }
- // Private Methods
-
- /**
- * Decrypts an AES-encrypted value using the given {@link Cipher}
- *
- * @param value The value to decrypt.
- * @param decryptCipher The {@link Cipher} to use to decrypt.
- * @return The decrypted value.
- * @throws AesDecryptionException When an error occurs when decrypting.
- * @see Cipher#doFinal(byte[])
- * @since 2.0.0
- */
- private static String decryptAes(@NotNull String value, @NotNull Cipher decryptCipher) throws AesDecryptionException {
- try {
- return new String(decryptCipher.doFinal(DatatypeConverter.parseBase64Binary(value)), StandardCharsets.UTF_8);
- } catch (IllegalBlockSizeException | BadPaddingException e) {
- throw new AesDecryptionException(e);
- }
- }
-
- /**
- * Encrypts a value. It uses {@link CryptoSettingKeys#CRYPTO_SECRET_KEY} to encrypt the value.
- *
- * @param value The value to encrypt.
- * @param encryptCipher The {@link Cipher} to use to encrypt.
- * @return The encrypted value.
- * @throws AesEncryptionException When an error occurs when encrypting.
- * @see Cipher#doFinal()
- * @since 2.0.0
- */
- private static String encryptAes(@NotNull String value, @NotNull Cipher encryptCipher) throws AesEncryptionException {
- try {
- return DatatypeConverter.printBase64Binary(encryptCipher.doFinal(value.getBytes(StandardCharsets.UTF_8)));
- } catch (IllegalBlockSizeException | BadPaddingException e) {
- throw new AesEncryptionException(e);
- }
- }
-
- /**
- * Gets correct {@link Cipher} for the given secret key.
- *
- * If not present it will initialize a new {@link Cipher} with the given secret ket and any subsequent usage will get the initialized {@link Cipher}.
- *
- * @param alternativeSecretKey A secret key which is not the {@link CryptoSettingKeys#CRYPTO_SECRET_KEY}.
- * @return The {@link Cipher} for the given secret key.
- * @since 2.0.0
- */
- private static synchronized Cipher getDecryptCipherForKey(@NotNull String alternativeSecretKey) {
- return ALTERNATIVES_AES_CIPHERS_DECRYPT.computeIfAbsent(alternativeSecretKey, secretKey -> {
- try {
- Key key = new SecretKeySpec(secretKey.getBytes(), AES_ALGORITHM);
-
- Cipher cipher = Cipher.getInstance(AES_ALGORITHM);
- cipher.init(Cipher.DECRYPT_MODE, key);
-
- return cipher;
- } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
- throw new AlgorihmNotAvailableRuntimeException(e, AES_ALGORITHM);
- } catch (InvalidKeyException e) {
- throw new InvalidSecretKeyRuntimeException(e, AES_ALGORITHM, secretKey);
- }
- });
- }
-
- /**
- * Gets correct {@link Cipher} for the given secret key.
- *
- * If not present it will initialize a new {@link Cipher} with the given secret ket and any subsequent usage will get the initialized {@link Cipher}.
- *
- * @param alternativeSecretKey A secret key which is not the {@link CryptoSettingKeys#CRYPTO_SECRET_KEY}.
- * @return The {@link Cipher} for the given secret key.
- * @since 2.0.0
- */
- private static synchronized Cipher getEncryptCipherForKey(@NotNull String alternativeSecretKey) {
- return ALTERNATIVES_AES_CIPHERS_ENCRYPT.computeIfAbsent(alternativeSecretKey, secretKey -> {
- try {
- Key key = new SecretKeySpec(secretKey.getBytes(), AES_ALGORITHM);
-
- Cipher cipher = Cipher.getInstance(AES_ALGORITHM);
- cipher.init(Cipher.ENCRYPT_MODE, key);
-
- return cipher;
- } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
- throw new AlgorihmNotAvailableRuntimeException(e, AES_ALGORITHM);
- } catch (InvalidKeyException e) {
- throw new InvalidSecretKeyRuntimeException(e, AES_ALGORITHM, secretKey);
- }
- });
- }
+ String encodeBase64(@NotNull String value);
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/crypto/CryptoUtilImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/crypto/CryptoUtilImpl.java
new file mode 100644
index 00000000000..84b62ebf9ec
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/crypto/CryptoUtilImpl.java
@@ -0,0 +1,220 @@
+/*******************************************************************************
+ * 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
+ * Red Hat Inc
+ *******************************************************************************/
+package org.eclipse.kapua.commons.crypto;
+
+import com.google.common.base.Strings;
+import org.eclipse.kapua.commons.crypto.exception.AesDecryptionException;
+import org.eclipse.kapua.commons.crypto.exception.AesEncryptionException;
+import org.eclipse.kapua.commons.crypto.exception.AlgorihmNotAvailableRuntimeException;
+import org.eclipse.kapua.commons.crypto.exception.InvalidSecretKeyRuntimeException;
+import org.eclipse.kapua.commons.crypto.setting.CryptoSettingKeys;
+import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.SecretKeySpec;
+import javax.inject.Inject;
+import javax.validation.constraints.NotNull;
+import javax.xml.bind.DatatypeConverter;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Utilities to crypt and decrypt values, and related tasks.
+ *
+ * @since 1.0.0
+ */
+public class CryptoUtilImpl implements CryptoUtil {
+
+ private static final String AES_ALGORITHM = "AES";
+ private final Cipher defaultAesCipherDecrypt;
+ private final Cipher defaultAesCipherEncrypt;
+
+ private final Map alternativesAesCiphersDecrypt = new HashMap<>();
+ private final Map alternativesAesCiphersEncrypt = new HashMap<>();
+
+ @Inject
+ public CryptoUtilImpl(CryptoSettings cryptoSettings) {
+ String defaultSecretKey = cryptoSettings.getString(CryptoSettingKeys.CIPHER_KEY);
+
+ final String cryptSecretKey = cryptoSettings.getString(CryptoSettingKeys.CRYPTO_SECRET_KEY);
+ if (!Strings.isNullOrEmpty(cryptSecretKey)) {
+ defaultSecretKey = cryptSecretKey;
+ }
+
+ //TODO: FIXME: Is failing here really necessary? Or should this just be a warning?
+// if (("changeMePlease!!".equals(defaultSecretKey) ||
+// "rv;ipse329183!@#".equals(defaultSecretKey)) &&
+// cryptoSettings.getBoolean(CryptoSettingKeys.CRYPTO_SECRET_ENFORCE_CHANGE)) {
+// throw new DefaultSecretKeyDetectedRuntimeException(defaultSecretKey);
+// }
+
+ Key aesKey = new SecretKeySpec(defaultSecretKey.getBytes(), AES_ALGORITHM);
+
+ try {
+ this.defaultAesCipherDecrypt = Cipher.getInstance(AES_ALGORITHM);
+ this.defaultAesCipherDecrypt.init(Cipher.DECRYPT_MODE, aesKey);
+
+ this.defaultAesCipherEncrypt = Cipher.getInstance(AES_ALGORITHM);
+ this.defaultAesCipherEncrypt.init(Cipher.ENCRYPT_MODE, aesKey);
+ } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+ throw new AlgorihmNotAvailableRuntimeException(e, AES_ALGORITHM);
+ } catch (InvalidKeyException e) {
+ throw new InvalidSecretKeyRuntimeException(e, AES_ALGORITHM, defaultSecretKey);
+ }
+ }
+
+ // SHA-1
+
+ @Override
+ public String sha1Hash(@NotNull String value) throws NoSuchAlgorithmException {
+ MessageDigest md = MessageDigest.getInstance("SHA-1");
+ byte[] encodedBytes = md.digest(value.getBytes(StandardCharsets.UTF_8));
+ return DatatypeConverter.printBase64Binary(encodedBytes);
+ }
+ // AES
+
+ @Override
+ public String decryptAes(@NotNull String value) throws AesDecryptionException {
+ return decryptAes(value, defaultAesCipherDecrypt);
+ }
+
+ @Override
+ public String decryptAes(@NotNull String value, @NotNull String alternativeSecretKey) throws AesDecryptionException {
+ Cipher decryptCipher = getDecryptCipherForKey(alternativeSecretKey);
+
+ return decryptAes(value, decryptCipher);
+ }
+
+ @Override
+ public String encryptAes(@NotNull String value) throws AesEncryptionException {
+ return encryptAes(value, defaultAesCipherEncrypt);
+ }
+
+ @Override
+ public String encryptAes(@NotNull String value, @NotNull String alternativeSecretKey) throws AesEncryptionException {
+ Cipher encryptCipher = getEncryptCipherForKey(alternativeSecretKey);
+
+ return encryptAes(value, encryptCipher);
+ }
+ // Base 64
+
+ @Override
+ public String decodeBase64(@NotNull String value) {
+ byte[] decodedBytes = DatatypeConverter.parseBase64Binary(value);
+ return new String(decodedBytes, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public String encodeBase64(@NotNull String value) {
+ byte[] bytesValue = value.getBytes(StandardCharsets.UTF_8);
+ return DatatypeConverter.printBase64Binary(bytesValue);
+ }
+ // Private Methods
+
+ /**
+ * Decrypts an AES-encrypted value using the given {@link Cipher}
+ *
+ * @param value The value to decrypt.
+ * @param decryptCipher The {@link Cipher} to use to decrypt.
+ * @return The decrypted value.
+ * @throws AesDecryptionException When an error occurs when decrypting.
+ * @see Cipher#doFinal(byte[])
+ * @since 2.0.0
+ */
+ public String decryptAes(@NotNull String value, @NotNull Cipher decryptCipher) throws AesDecryptionException {
+ try {
+ return new String(decryptCipher.doFinal(DatatypeConverter.parseBase64Binary(value)), StandardCharsets.UTF_8);
+ } catch (IllegalBlockSizeException | BadPaddingException e) {
+ throw new AesDecryptionException(e);
+ }
+ }
+
+ /**
+ * Encrypts a value. It uses {@link CryptoSettingKeys#CRYPTO_SECRET_KEY} to encrypt the value.
+ *
+ * @param value The value to encrypt.
+ * @param encryptCipher The {@link Cipher} to use to encrypt.
+ * @return The encrypted value.
+ * @throws AesEncryptionException When an error occurs when encrypting.
+ * @see Cipher#doFinal()
+ * @since 2.0.0
+ */
+ private String encryptAes(@NotNull String value, @NotNull Cipher encryptCipher) throws AesEncryptionException {
+ try {
+ return DatatypeConverter.printBase64Binary(encryptCipher.doFinal(value.getBytes(StandardCharsets.UTF_8)));
+ } catch (IllegalBlockSizeException | BadPaddingException e) {
+ throw new AesEncryptionException(e);
+ }
+ }
+
+ /**
+ * Gets correct {@link Cipher} for the given secret key.
+ *
+ * If not present it will initialize a new {@link Cipher} with the given secret ket and any subsequent usage will get the initialized {@link Cipher}.
+ *
+ * @param alternativeSecretKey A secret key which is not the {@link CryptoSettingKeys#CRYPTO_SECRET_KEY}.
+ * @return The {@link Cipher} for the given secret key.
+ * @since 2.0.0
+ */
+ private synchronized Cipher getDecryptCipherForKey(@NotNull String alternativeSecretKey) {
+ return alternativesAesCiphersDecrypt.computeIfAbsent(alternativeSecretKey, secretKey -> {
+ try {
+ Key key = new SecretKeySpec(secretKey.getBytes(), AES_ALGORITHM);
+
+ Cipher cipher = Cipher.getInstance(AES_ALGORITHM);
+ cipher.init(Cipher.DECRYPT_MODE, key);
+
+ return cipher;
+ } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+ throw new AlgorihmNotAvailableRuntimeException(e, AES_ALGORITHM);
+ } catch (InvalidKeyException e) {
+ throw new InvalidSecretKeyRuntimeException(e, AES_ALGORITHM, secretKey);
+ }
+ });
+ }
+
+ /**
+ * Gets correct {@link Cipher} for the given secret key.
+ *
+ * If not present it will initialize a new {@link Cipher} with the given secret ket and any subsequent usage will get the initialized {@link Cipher}.
+ *
+ * @param alternativeSecretKey A secret key which is not the {@link CryptoSettingKeys#CRYPTO_SECRET_KEY}.
+ * @return The {@link Cipher} for the given secret key.
+ * @since 2.0.0
+ */
+ private synchronized Cipher getEncryptCipherForKey(@NotNull String alternativeSecretKey) {
+ return alternativesAesCiphersEncrypt.computeIfAbsent(alternativeSecretKey, secretKey -> {
+ try {
+ Key key = new SecretKeySpec(secretKey.getBytes(), AES_ALGORITHM);
+
+ Cipher cipher = Cipher.getInstance(AES_ALGORITHM);
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+
+ return cipher;
+ } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+ throw new AlgorihmNotAvailableRuntimeException(e, AES_ALGORITHM);
+ } catch (InvalidKeyException e) {
+ throw new InvalidSecretKeyRuntimeException(e, AES_ALGORITHM, secretKey);
+ }
+ });
+ }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/crypto/setting/CryptoSettings.java b/commons/src/main/java/org/eclipse/kapua/commons/crypto/setting/CryptoSettings.java
index a0a72444363..55d88bede4c 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/crypto/setting/CryptoSettings.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/crypto/setting/CryptoSettings.java
@@ -29,29 +29,12 @@ public class CryptoSettings extends AbstractKapuaSetting {
*/
private static final String CRYPTO_SETTING_RESOURCE = "crypto-settings.properties";
- /**
- * Singleton instance.
- *
- * @since 2.0.0
- */
- private static final CryptoSettings INSTANCE = new CryptoSettings();
-
/**
* Constructor.
*
* @since 2.0.0
*/
- private CryptoSettings() {
+ public CryptoSettings() {
super(CRYPTO_SETTING_RESOURCE);
}
-
- /**
- * Gets a singleton instance of {@link CryptoSettings}.
- *
- * @return A singleton instance of {@link CryptoSettings}.
- * @since 2.0.0
- */
- public static CryptoSettings getInstance() {
- return INSTANCE;
- }
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/RaiseServiceEventInterceptor.java b/commons/src/main/java/org/eclipse/kapua/commons/event/RaiseServiceEventInterceptor.java
index b21a4ace1e3..f7ff21848bd 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/RaiseServiceEventInterceptor.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/RaiseServiceEventInterceptor.java
@@ -17,8 +17,6 @@
import org.aopalliance.intercept.MethodInvocation;
import org.eclipse.kapua.KapuaEntityNotFoundException;
import org.eclipse.kapua.commons.core.InterceptorBind;
-import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
-import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
import org.eclipse.kapua.commons.metric.CommonsMetric;
import org.eclipse.kapua.commons.model.id.KapuaEid;
import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
@@ -26,10 +24,10 @@
import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecord;
import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
import org.eclipse.kapua.commons.service.event.store.api.ServiceEventUtil;
-import org.eclipse.kapua.commons.service.event.store.internal.EventStoreRecordImplJpaRepository;
import org.eclipse.kapua.event.RaiseServiceEvent;
import org.eclipse.kapua.event.ServiceEvent;
import org.eclipse.kapua.event.ServiceEvent.EventStatus;
+import org.eclipse.kapua.event.ServiceEventBus;
import org.eclipse.kapua.event.ServiceEventBusException;
import org.eclipse.kapua.locator.KapuaProvider;
import org.eclipse.kapua.model.KapuaEntity;
@@ -59,12 +57,15 @@ public class RaiseServiceEventInterceptor implements MethodInterceptor {
private static final Logger LOG = LoggerFactory.getLogger(RaiseServiceEventInterceptor.class);
- //FIXME: inject the repo!
- private final EventStoreRecordRepository repository = new EventStoreRecordImplJpaRepository(new KapuaJpaRepositoryConfiguration());
-
- @Named("maxInsertAttempts")
@Inject
- private Integer maxInsertAttempts;
+ private EventStoreRecordRepository eventStoreRecordRepository;
+ @Named("kapuaEventsTxManager")
+ @Inject
+ private TxManager txManager;
+ @Inject
+ private CommonsMetric commonsMetric;
+ @Inject
+ private ServiceEventBus serviceEventBus;
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
@@ -166,7 +167,7 @@ private void fillEvent(MethodInvocation invocation, ServiceEvent serviceEvent) {
private void useEntityToFillEvent(ServiceEvent serviceEvent, List entities) {
if (entities.size() > 1) {
LOG.warn("Found more than one KapuaEntity in the parameters! Assuming to use the first one!");
- CommonsMetric.getInstance().getRaiseEventWrongEntity().inc();
+ commonsMetric.getRaiseEventWrongEntity().inc();
}
KapuaEntity entity = entities.get(0);
serviceEvent.setEntityType(entity.getClass().getName());
@@ -178,7 +179,7 @@ private void useEntityToFillEvent(ServiceEvent serviceEvent, List e
private void useKapuaIdsToFillEvent(ServiceEvent serviceEvent, List ids, Class[] implementedClass) {
if (ids.size() > 2) {
LOG.warn("Found more than two KapuaId in the parameters! Assuming to use the first two!");
- CommonsMetric.getInstance().getRaiseEventWrongId().inc();
+ commonsMetric.getRaiseEventWrongId().inc();
}
if (ids.size() >= 2) {
serviceEvent.setEntityScopeId(ids.get(0));
@@ -232,7 +233,7 @@ private void logFoundEntities(List entities, List ids) {
private void sendEvent(ServiceEvent serviceEvent) throws ServiceEventBusException {
String address = ServiceMap.getAddress(serviceEvent.getService());
try {
- ServiceEventBusManager.getInstance().publish(address, serviceEvent);
+ serviceEventBus.publish(address, serviceEvent);
LOG.info("SENT event from service {} to {} - entity type {} - entity scope id {} - entity id {} - context id {}",
serviceEvent.getService(),
address,
@@ -254,15 +255,13 @@ private void updateEventStatus(ServiceEvent serviceEventBus, EventStatus newServ
return;
}
try {
- final TxManager txManager = new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-events");
-
serviceEventBus.setStatus(newServiceEventStatus);
txManager.execute(tx -> {
final KapuaEid eventId = KapuaEid.parseCompactId(serviceEventBus.getId());
- final EventStoreRecord eventStoreRecord = repository.find(tx, serviceEventBus.getScopeId(), eventId)
+ final EventStoreRecord eventStoreRecord = eventStoreRecordRepository.find(tx, serviceEventBus.getScopeId(), eventId)
.orElseThrow(() -> new KapuaEntityNotFoundException(EventStoreRecord.TYPE, eventId));
final EventStoreRecord updatedEventStoreRecord = ServiceEventUtil.mergeToEntity(eventStoreRecord, serviceEventBus);
- return repository.update(tx, eventStoreRecord, updatedEventStoreRecord);
+ return eventStoreRecordRepository.update(tx, eventStoreRecord, updatedEventStoreRecord);
});
} catch (Throwable t) {
// this may be a valid condition if the HouseKeeper is doing the update concurrently with this task
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusDriver.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusDriver.java
index f6cfd8dfdce..c52986f56b1 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusDriver.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusDriver.java
@@ -17,6 +17,10 @@
public interface ServiceEventBusDriver {
+ /**
+ * @deprecated since 2.0.0 - this property was part of an unnecessary complication
+ */
+ @Deprecated
public String getType();
public void start() throws ServiceEventBusException;
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusManager.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusManager.java
index d16e7bcdee7..717070157f6 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusManager.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventBusManager.java
@@ -12,49 +12,47 @@
*******************************************************************************/
package org.eclipse.kapua.commons.event;
-import org.eclipse.kapua.KapuaRuntimeException;
import org.eclipse.kapua.event.ServiceEventBus;
import org.eclipse.kapua.event.ServiceEventBusException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ServiceLoader;
+import org.eclipse.kapua.locator.KapuaLocator;
/**
* Service event bus manager. It handles the service event bus life cycle
*
* @since 1.0
+ * @deprecated since 2.0.0 - over-engineering, rendered redundant by DI, absorbed in ServiceModuleBundle
*/
+@Deprecated
public class ServiceEventBusManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(ServiceEventBusManager.class);
-
- public static final String JMS_20_EVENT_BUS = "JMS_20_EVENT_BUS";
+ //Code Removed with deprecation, left to help migration out of this class
+// public static final String JMS_20_EVENT_BUS = "JMS_20_EVENT_BUS";
- private static Map serviceEventBusDrivers;
+ //Code Removed with deprecation, left to help migration out of this class
+ // private static Map serviceEventBusDrivers;
+ private static final ServiceEventBusDriver SERVICE_EVENT_BUS_DRIVER = KapuaLocator.getInstance().getComponent(ServiceEventBusDriver.class);
private static boolean started;
- static {
- try {
- LOGGER.info("Finding event bus driver instance...");
- serviceEventBusDrivers = new HashMap<>();
- ServiceLoader eventBusLoaders = ServiceLoader.load(ServiceEventBusDriver.class);
- for (ServiceEventBusDriver eventBusDriverLoader : eventBusLoaders) {
- if (serviceEventBusDrivers.containsKey(eventBusDriverLoader.getType())) {
- LOGGER.warn("Event bus driver instance of type {} is already loaded...SKIPPED", eventBusDriverLoader.getType());
- continue;
- }
- serviceEventBusDrivers.put(eventBusDriverLoader.getType(), eventBusDriverLoader);
- LOGGER.info("Event bus driver instance {}...ADDED", eventBusDriverLoader.getType());
- }
- LOGGER.info("Finding event bus driver instance...DONE");
- } catch (Exception ex) {
- LOGGER.error("Error while initializing {}, {}", ServiceEventBusManager.class.getName(), ex.getMessage(), ex);
- throw KapuaRuntimeException.internalError(ex, String.format("Error while initializing %s", ServiceEventBusManager.class.getName()));
- }
- }
+ //Code Removed with deprecation, left to help migration out of this class
+// static {
+// try {
+// LOGGER.info("Finding event bus driver instance...");
+// serviceEventBusDrivers = new HashMap<>();
+// ServiceLoader eventBusLoaders = ServiceLoader.load(ServiceEventBusDriver.class);
+// for (ServiceEventBusDriver eventBusDriverLoader : eventBusLoaders) {
+// if (serviceEventBusDrivers.containsKey(eventBusDriverLoader.getType())) {
+// LOGGER.warn("Event bus driver instance of type {} is already loaded...SKIPPED", eventBusDriverLoader.getType());
+// continue;
+// }
+// serviceEventBusDrivers.put(eventBusDriverLoader.getType(), eventBusDriverLoader);
+// LOGGER.info("Event bus driver instance {}...ADDED", eventBusDriverLoader.getType());
+// }
+// LOGGER.info("Finding event bus driver instance...DONE");
+// } catch (Exception ex) {
+// LOGGER.error("Error while initializing {}, {}", ServiceEventBusManager.class.getName(), ex.getMessage(), ex);
+// throw KapuaRuntimeException.internalError(ex, String.format("Error while initializing %s", ServiceEventBusManager.class.getName()));
+// }
+// }
private ServiceEventBusManager() {
}
@@ -69,14 +67,16 @@ public static ServiceEventBus getInstance() throws ServiceEventBusException {
if (!started) {
throw new ServiceEventBusException("The event bus isn't initialized! Cannot perform any operation!");
}
-
+ return SERVICE_EVENT_BUS_DRIVER.getEventBus();
+ //Code Removed with deprecation, left to help migration out of this class
// Currently hard wired to use the provided instance of JMS_20_EVENT_BUS
// May be extended in future versions
-
- if (serviceEventBusDrivers.get(JMS_20_EVENT_BUS) == null) {
- throw new ServiceEventBusException(String.format("No eventbus drivers found for type %s", JMS_20_EVENT_BUS));
- }
- return serviceEventBusDrivers.get(JMS_20_EVENT_BUS).getEventBus();
+//
+// if (serviceEventBusDrivers.get(JMS_20_EVENT_BUS) == null) {
+// if (serviceEventBusDriver) {
+// throw new ServiceEventBusException(String.format("No eventbus drivers found for type %s", JMS_20_EVENT_BUS));
+// }
+// return serviceEventBusDrivers.get(JMS_20_EVENT_BUS).getEventBus();
}
/**
@@ -85,8 +85,12 @@ public static ServiceEventBus getInstance() throws ServiceEventBusException {
* @throws ServiceEventBusException
*/
public static void start() throws ServiceEventBusException {
- if (serviceEventBusDrivers.get(JMS_20_EVENT_BUS) != null) {
- serviceEventBusDrivers.get(JMS_20_EVENT_BUS).start();
+ //Code Removed with deprecation, left to help migration out of this class
+// if (serviceEventBusDrivers.get(JMS_20_EVENT_BUS) != null) {
+// serviceEventBusDrivers.get(JMS_20_EVENT_BUS).start();
+// }
+ if (SERVICE_EVENT_BUS_DRIVER != null) {
+ SERVICE_EVENT_BUS_DRIVER.start();
}
started = true;
}
@@ -97,8 +101,12 @@ public static void start() throws ServiceEventBusException {
* @throws ServiceEventBusException
*/
public static void stop() throws ServiceEventBusException {
- if (serviceEventBusDrivers.get(JMS_20_EVENT_BUS) != null) {
- serviceEventBusDrivers.get(JMS_20_EVENT_BUS).stop();
+ //Code Removed with deprecation, left to help migration out of this class
+// if (serviceEventBusDrivers.get(JMS_20_EVENT_BUS) != null) {
+// serviceEventBusDrivers.get(JMS_20_EVENT_BUS).stop();
+// }
+ if (SERVICE_EVENT_BUS_DRIVER != null) {
+ SERVICE_EVENT_BUS_DRIVER.stop();
}
started = false;
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventHouseKeeperFactoryImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventHouseKeeperFactoryImpl.java
index caa1b7f3c20..4c08e0dc50f 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventHouseKeeperFactoryImpl.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventHouseKeeperFactoryImpl.java
@@ -13,6 +13,7 @@
package org.eclipse.kapua.commons.event;
import org.eclipse.kapua.commons.service.event.store.api.EventStoreService;
+import org.eclipse.kapua.event.ServiceEventBus;
import org.eclipse.kapua.storage.TxManager;
import java.util.List;
@@ -21,14 +22,16 @@ public class ServiceEventHouseKeeperFactoryImpl implements ServiceEventHouseKeep
private final EventStoreService eventStoreService;
private final TxManager txManager;
+ private final ServiceEventBus serviceEventBus;
- public ServiceEventHouseKeeperFactoryImpl(EventStoreService eventStoreService, TxManager txManager) {
+ public ServiceEventHouseKeeperFactoryImpl(EventStoreService eventStoreService, TxManager txManager, ServiceEventBus serviceEventBus) {
this.eventStoreService = eventStoreService;
this.txManager = txManager;
+ this.serviceEventBus = serviceEventBus;
}
@Override
public ServiceEventTransactionalHousekeeper apply(List servicesEntryList) {
- return new ServiceEventTransactionalHousekeeper(eventStoreService, txManager, servicesEntryList);
+ return new ServiceEventTransactionalHousekeeper(eventStoreService, txManager, serviceEventBus, servicesEntryList);
}
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventModule.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventModule.java
index 7c2c5745465..d043594a9bf 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventModule.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventModule.java
@@ -70,7 +70,7 @@ public void start() throws KapuaException {
LOGGER.info("Starting service event module... initialize configurations");
serviceEventModuleConfiguration = initializeConfiguration();
LOGGER.info("Starting service event module... initialize event bus");
- ServiceEventBus eventbus = ServiceEventBusManager.getInstance();
+ ServiceEventBus eventbus = KapuaLocator.getInstance().getComponent(ServiceEventBus.class);
LOGGER.info("Starting service event module... initialize event subscriptions");
List servicesEntryList = new ArrayList<>();
if (serviceEventModuleConfiguration.getServiceEventClientConfigurations() != null) {
@@ -93,7 +93,7 @@ public void start() throws KapuaException {
// register events to the service map
LOGGER.info("Starting service event module... register services names");
- ServiceMap.registerServices(serviceEventModuleConfiguration.getInternalAddress(), servicesEntryList);
+ ServiceMap.registerServices(servicesEntryList);
// Start the House keeper
LOGGER.info("Starting service event module... start housekeeper");
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalHousekeeper.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalHousekeeper.java
index 4d593315c74..3895e025656 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalHousekeeper.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalHousekeeper.java
@@ -26,6 +26,7 @@
import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
import org.eclipse.kapua.commons.util.KapuaDateUtils;
import org.eclipse.kapua.event.ServiceEvent.EventStatus;
+import org.eclipse.kapua.event.ServiceEventBus;
import org.eclipse.kapua.event.ServiceEventBusException;
import org.eclipse.kapua.model.KapuaUpdatableEntityAttributes;
import org.eclipse.kapua.model.query.predicate.AndPredicate;
@@ -62,11 +63,12 @@ private enum EventsProcessType {
private final Object monitor = new Object();
- private EventStoreService kapuaEventService;
+ private final EventStoreService kapuaEventService;
+ private final ServiceEventBus serviceEventBus;
- private TxContext txContext;
+ private final TxContext txContext;
- private List servicesEntryList;
+ private final List servicesEntryList;
private boolean running;
/**
@@ -75,10 +77,11 @@ private enum EventsProcessType {
* @param txManager
* @param servicesEntryList
*/
- public ServiceEventTransactionalHousekeeper(EventStoreService eventStoreService, TxManager txManager, List servicesEntryList) {
+ public ServiceEventTransactionalHousekeeper(EventStoreService eventStoreService, TxManager txManager, ServiceEventBus serviceEventBus, List servicesEntryList) {
this.servicesEntryList = servicesEntryList;
this.txContext = txManager.getTxContext();
this.kapuaEventService = eventStoreService;
+ this.serviceEventBus = serviceEventBus;
}
@Override
@@ -136,7 +139,7 @@ private void findAndSendUnsentEvents(String serviceName, EventsProcessType event
kapuaEvent.getOperation(),
kapuaEvent.getContextId());
- ServiceEventBusManager.getInstance().publish(address, ServiceEventUtil.toServiceEventBus(kapuaEvent));
+ serviceEventBus.publish(address, ServiceEventUtil.toServiceEventBus(kapuaEvent));
//if message was sent successfully then confirm the event in the event table
//if something goes wrong during this update the event message may be raised twice (but this condition should happens rarely and it is compliant to the contract of the service events)
//this is done in a different transaction
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalModule.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalModule.java
index 60a676fed17..8af796f63f5 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalModule.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceEventTransactionalModule.java
@@ -12,24 +12,23 @@
*******************************************************************************/
package org.eclipse.kapua.commons.event;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.commons.core.ServiceModule;
+import org.eclipse.kapua.event.ServiceEventBus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.core.ServiceModule;
-import org.eclipse.kapua.event.ServiceEventBus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public abstract class ServiceEventTransactionalModule implements ServiceModule {
private static final Logger LOGGER = LoggerFactory.getLogger(ServiceEventTransactionalModule.class);
@@ -51,24 +50,17 @@ private String getSubscriptionName(String address, String subscriber) {
private final ServiceEventClientConfiguration[] serviceEventClientConfigurations;
private final String internalAddress;
private final ServiceEventHouseKeeperFactory houseKeeperFactory;
+ private final ServiceEventBus serviceEventBus;
public ServiceEventTransactionalModule(
ServiceEventClientConfiguration[] serviceEventClientConfigurations,
String internalAddress,
- ServiceEventHouseKeeperFactory serviceEventTransactionalHousekeeperFactory) {
-
- // generate a unique client id
- this(serviceEventClientConfigurations, internalAddress, UUID.randomUUID().toString(), serviceEventTransactionalHousekeeperFactory);
- }
-
- public ServiceEventTransactionalModule(
- ServiceEventClientConfiguration[] serviceEventClientConfigurations,
- String internalAddress,
- String uniqueClientId,
- ServiceEventHouseKeeperFactory serviceEventTransactionalHousekeeperFactory) {
- this.serviceEventClientConfigurations = appendClientId(uniqueClientId, serviceEventClientConfigurations);
+ ServiceEventHouseKeeperFactory serviceEventTransactionalHousekeeperFactory,
+ ServiceEventBus serviceEventBus) {
+ this.serviceEventClientConfigurations = serviceEventClientConfigurations;
this.internalAddress = internalAddress;
this.houseKeeperFactory = serviceEventTransactionalHousekeeperFactory;
+ this.serviceEventBus = serviceEventBus;
}
@@ -77,7 +69,6 @@ public void start() throws KapuaException {
LOGGER.info("Starting service event module... {}", this.getClass().getName());
LOGGER.info("Starting service event module... initialize configurations");
LOGGER.info("Starting service event module... initialize event bus");
- ServiceEventBus eventbus = ServiceEventBusManager.getInstance();
LOGGER.info("Starting service event module... initialize event subscriptions");
List servicesEntryList = new ArrayList<>();
if (serviceEventClientConfigurations != null) {
@@ -89,7 +80,7 @@ public void start() throws KapuaException {
}
// Listen to upstream service events
if (selc.getEventListener() != null) {
- eventbus.subscribe(address, getSubscriptionName(address, selc.getClientName()), selc.getEventListener());
+ serviceEventBus.subscribe(address, getSubscriptionName(address, selc.getClientName()), selc.getEventListener());
}
servicesEntryList.add(new ServiceEntry(selc.getClientName(), address));
subscriberNames.add(selc.getClientName()); // Set because names must be unique
@@ -100,7 +91,7 @@ public void start() throws KapuaException {
// register events to the service map
LOGGER.info("Starting service event module... register services names");
- ServiceMap.registerServices(internalAddress, servicesEntryList);
+ ServiceMap.registerServices(servicesEntryList);
// Start the House keeper
LOGGER.info("Starting service event module... start housekeeper");
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceMap.java b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceMap.java
index 7dda7b22540..e822b139b1e 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceMap.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/ServiceMap.java
@@ -39,10 +39,9 @@ private ServiceMap() {
/**
* Register the list of services to the provided address
*
- * @param serviceDefaultAddress
* @param servicesEntryList
*/
- public static synchronized void registerServices(String serviceDefaultAddress, List servicesEntryList) {
+ public static synchronized void registerServices(List servicesEntryList) {
for (ServiceEntry serviceEntry : servicesEntryList) {
//register service name
String tmpServiceName = AVAILABLE_SERVICES.get(serviceEntry.getServiceName());
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/event/jms/JMSServiceEventBus.java b/commons/src/main/java/org/eclipse/kapua/commons/event/jms/JMSServiceEventBus.java
index 442c6faec67..bc18b83f1cd 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/event/jms/JMSServiceEventBus.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/event/jms/JMSServiceEventBus.java
@@ -12,37 +12,15 @@
*******************************************************************************/
package org.eclipse.kapua.commons.event.jms;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.pool2.BasePooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.apache.qpid.jms.jndi.JmsInitialContextFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.eclipse.kapua.KapuaException;
import org.eclipse.kapua.KapuaRuntimeException;
import org.eclipse.kapua.commons.event.ServiceEventBusDriver;
-import org.eclipse.kapua.commons.event.ServiceEventBusManager;
import org.eclipse.kapua.commons.event.ServiceEventMarshaler;
import org.eclipse.kapua.commons.event.ServiceEventScope;
import org.eclipse.kapua.commons.metric.CommonsMetric;
@@ -54,6 +32,27 @@
import org.eclipse.kapua.event.ServiceEventBus;
import org.eclipse.kapua.event.ServiceEventBusException;
import org.eclipse.kapua.event.ServiceEventBusListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* JMS event bus implementation
@@ -64,31 +63,41 @@ public class JMSServiceEventBus implements ServiceEventBus, ServiceEventBusDrive
private static final Logger LOGGER = LoggerFactory.getLogger(JMSServiceEventBus.class);
- private static final int PRODUCER_POOL_MIN_SIZE = SystemSetting.getInstance().getInt(SystemSettingKey.EVENT_BUS_PRODUCER_POOL_MIN_SIZE);
- private static final int PRODUCER_POOL_MAX_SIZE = SystemSetting.getInstance().getInt(SystemSettingKey.EVENT_BUS_PRODUCER_POOL_MAX_SIZE);
- private static final int PRODUCER_POOL_BORROW_WAIT = SystemSetting.getInstance().getInt(SystemSettingKey.EVENT_BUS_PRODUCER_POOL_BORROW_WAIT_MAX);
- private static final int PRODUCER_POOL_EVICTION_INTERVAL = SystemSetting.getInstance().getInt(SystemSettingKey.EVENT_BUS_PRODUCER_EVICTION_INTERVAL);
- private static final int CONSUMER_POOL_SIZE = SystemSetting.getInstance().getInt(SystemSettingKey.EVENT_BUS_CONSUMER_POOL_SIZE);
- private static final String MESSAGE_SERIALIZER = SystemSetting.getInstance().getString(SystemSettingKey.EVENT_BUS_MESSAGE_SERIALIZER);
- private static final String TRANSPORT_USE_EPOLL = SystemSetting.getInstance().getString(SystemSettingKey.EVENT_BUS_TRANSPORT_USE_EPOLL);
+ private final int producerPoolMinSize;
+ private final int producerPoolMaxSize;
+ private final int producerPoolBorrowWait;
+ private final int producerPoolEvictionInterval;
+ private final int consumerPoolSize;
+ private final String transportUseEpoll;
- private List subscriptionList = new ArrayList<>();
private EventBusJMSConnectionBridge eventBusJMSConnectionBridge;
- private ServiceEventMarshaler eventBusMarshaler;
+ private final SystemSetting systemSetting;
+ private final CommonsMetric commonsMetric;
+ private final List subscriptionList = new ArrayList<>();
+ private final ServiceEventMarshaler eventBusMarshaler;
/**
* Default constructor
- *
- * @throws JMSException
- * @throws NamingException
*/
- public JMSServiceEventBus() throws JMSException, NamingException {
- eventBusJMSConnectionBridge = new EventBusJMSConnectionBridge();
+ @Inject
+ public JMSServiceEventBus(SystemSetting systemSetting,
+ CommonsMetric commonsMetric,
+ ServiceEventMarshaler eventBusMarshaler) {
+ this.systemSetting = systemSetting;
+ this.commonsMetric = commonsMetric;
+ this.eventBusMarshaler = eventBusMarshaler;
+ this.eventBusJMSConnectionBridge = new EventBusJMSConnectionBridge();
+ this.producerPoolMinSize = systemSetting.getInt(SystemSettingKey.EVENT_BUS_PRODUCER_POOL_MIN_SIZE);
+ this.producerPoolMaxSize = systemSetting.getInt(SystemSettingKey.EVENT_BUS_PRODUCER_POOL_MAX_SIZE);
+ this.producerPoolBorrowWait = systemSetting.getInt(SystemSettingKey.EVENT_BUS_PRODUCER_POOL_BORROW_WAIT_MAX);
+ this.producerPoolEvictionInterval = systemSetting.getInt(SystemSettingKey.EVENT_BUS_PRODUCER_EVICTION_INTERVAL);
+ this.consumerPoolSize = systemSetting.getInt(SystemSettingKey.EVENT_BUS_CONSUMER_POOL_SIZE);
+ this.transportUseEpoll = systemSetting.getString(SystemSettingKey.EVENT_BUS_TRANSPORT_USE_EPOLL);
}
@Override
public String getType() {
- return ServiceEventBusManager.JMS_20_EVENT_BUS;
+ return "JMS_20_EVENT_BUS";
}
/**
@@ -99,15 +108,8 @@ public String getType() {
@Override
public void start() throws ServiceEventBusException {
try {
- // initialize event bus marshaler
- Class messageSerializerClazz = Class.forName(MESSAGE_SERIALIZER);
- if (ServiceEventMarshaler.class.isAssignableFrom(messageSerializerClazz)) {
- eventBusMarshaler = (ServiceEventMarshaler) messageSerializerClazz.newInstance();
- } else {
- throw new ServiceEventBusException(String.format("Wrong message serializer Object type ('%s')!", messageSerializerClazz));
- }
eventBusJMSConnectionBridge.start();
- } catch (JMSException | ClassNotFoundException | NamingException | InstantiationException | IllegalAccessException e) {
+ } catch (JMSException | NamingException e) {
throw new ServiceEventBusException(e);
}
}
@@ -175,13 +177,12 @@ private synchronized void restart() throws ServiceEventBusException, JMSExceptio
} catch (Exception e) {
LOGGER.warn("Error while creating new Service Event Bus instance: {}", e.getMessage());
//try to cleanup the messy instance
- if (newInstance!=null) {
+ if (newInstance != null) {
try {
LOGGER.warn("Stopping new Service Event Bus instance...");
newInstance.stop();
LOGGER.warn("Stopping new Service Event Bus instance... DONE");
- }
- catch(Exception e1) {
+ } catch (Exception e1) {
//don't throw this exception since the real exception is the first one
LOGGER.warn("Stopping new Service Event Bus instance error: {}", e1.getMessage(), e1);
}
@@ -215,13 +216,13 @@ public EventBusJMSConnectionBridge() {
void start() throws JMSException, NamingException, ServiceEventBusException {
stop();
- String eventbusUrl = SystemSetting.getInstance().getString(SystemSettingKey.EVENT_BUS_URL);
- String eventbusUsername = SystemSetting.getInstance().getString(SystemSettingKey.EVENT_BUS_USERNAME);
- String eventbusPassword = SystemSetting.getInstance().getString(SystemSettingKey.EVENT_BUS_PASSWORD);
+ String eventbusUrl = systemSetting.getString(SystemSettingKey.EVENT_BUS_URL);
+ String eventbusUsername = systemSetting.getString(SystemSettingKey.EVENT_BUS_USERNAME);
+ String eventbusPassword = systemSetting.getString(SystemSettingKey.EVENT_BUS_PASSWORD);
Hashtable environment = new Hashtable<>();
environment.put("connectionfactory.eventBusUrl", eventbusUrl);
- environment.put("transport.useEpoll", TRANSPORT_USE_EPOLL);
+ environment.put("transport.useEpoll", transportUseEpoll);
JmsInitialContextFactory initialContextFactory = new JmsInitialContextFactory();
Context context = initialContextFactory.getInitialContext(environment);
@@ -302,7 +303,7 @@ synchronized void subscribe(Subscription subscription)
String subscriptionStr = String.format("$SYS/EVT/%s", subscription.getAddress());
// create a bunch of sessions to allow parallel event processing
LOGGER.info("Subscribing to address {} - name {} ...", subscriptionStr, subscription.getName());
- for (int i = 0; i < CONSUMER_POOL_SIZE; i++) {
+ for (int i = 0; i < consumerPoolSize; i++) {
final Session jmsSession = jmsConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Topic jmsTopic = jmsSession.createTopic(subscriptionStr);
MessageConsumer jmsConsumer = jmsSession.createSharedDurableConsumer(jmsTopic, subscription.getName());
@@ -332,7 +333,7 @@ synchronized void subscribe(Subscription subscription)
}
});
}
- LOGGER.info("Subscribing to address {} - name {} - pool size {} ...DONE", subscriptionStr, subscription.getName(), CONSUMER_POOL_SIZE);
+ LOGGER.info("Subscribing to address {} - name {} - pool size {} ...DONE", subscriptionStr, subscription.getName(), consumerPoolSize);
} catch (JMSException e) {
throw new ServiceEventBusException(e);
}
@@ -415,15 +416,15 @@ public SenderPool(PooledSenderFactory factory) {
super(factory);
GenericObjectPoolConfig senderPoolConfig = new GenericObjectPoolConfig();
- senderPoolConfig.setMinIdle(PRODUCER_POOL_MIN_SIZE);
- senderPoolConfig.setMaxIdle(PRODUCER_POOL_MAX_SIZE);
- senderPoolConfig.setMaxTotal(PRODUCER_POOL_MAX_SIZE);
- senderPoolConfig.setMaxWaitMillis(PRODUCER_POOL_BORROW_WAIT);
+ senderPoolConfig.setMinIdle(producerPoolMinSize);
+ senderPoolConfig.setMaxIdle(producerPoolMaxSize);
+ senderPoolConfig.setMaxTotal(producerPoolMaxSize);
+ senderPoolConfig.setMaxWaitMillis(producerPoolBorrowWait);
senderPoolConfig.setTestOnReturn(true);
senderPoolConfig.setTestOnBorrow(true);
senderPoolConfig.setTestWhileIdle(false);
senderPoolConfig.setBlockWhenExhausted(true);
- senderPoolConfig.setTimeBetweenEvictionRunsMillis(PRODUCER_POOL_EVICTION_INTERVAL);
+ senderPoolConfig.setTimeBetweenEvictionRunsMillis(producerPoolEvictionInterval);
setConfig(senderPoolConfig);
}
@@ -436,12 +437,12 @@ private class ExceptionListenerImpl implements ExceptionListener {
@Override
public void onException(JMSException e) {
LOGGER.error("EventBus Listener {} - Connection thrown exception: {}", this, e.getMessage(), e);
- CommonsMetric.getInstance().getEventBusConnectionError().inc();
+ commonsMetric.getEventBusConnectionError().inc();
int i = 1;
while (active) {
LOGGER.info("EventBus Listener {} - restarting attempt... {}", this, i);
try {
- CommonsMetric.getInstance().getEventBusConnectionRetry().inc();
+ commonsMetric.getEventBusConnectionRetry().inc();
restart();
LOGGER.info("EventBus Listener {} - EventBus restarting attempt... {} DONE (Connection restored)", this, i);
break;
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/jpa/CacheFactory.java b/commons/src/main/java/org/eclipse/kapua/commons/jpa/CacheFactory.java
index a86066e74e9..35c2091ce0d 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/jpa/CacheFactory.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/jpa/CacheFactory.java
@@ -24,5 +24,5 @@ public interface CacheFactory {
*
* @return an {@link EntityCache} instance.
*/
- EntityCache createCache();
+ EntityCache createCache(String idCacheName);
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/jpa/AbstractNamedEntityCacheFactory.java b/commons/src/main/java/org/eclipse/kapua/commons/jpa/EntityCacheFactory.java
similarity index 50%
rename from commons/src/main/java/org/eclipse/kapua/commons/jpa/AbstractNamedEntityCacheFactory.java
rename to commons/src/main/java/org/eclipse/kapua/commons/jpa/EntityCacheFactory.java
index 4de9453974b..e4880a02bcb 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/jpa/AbstractNamedEntityCacheFactory.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/jpa/EntityCacheFactory.java
@@ -12,24 +12,24 @@
*******************************************************************************/
package org.eclipse.kapua.commons.jpa;
+import com.google.inject.Inject;
+import org.eclipse.kapua.commons.metric.CommonsMetric;
import org.eclipse.kapua.commons.service.internal.cache.EntityCache;
-import org.eclipse.kapua.commons.service.internal.cache.NamedEntityCache;
+import org.eclipse.kapua.commons.service.internal.cache.KapuaCacheManager;
-public abstract class AbstractNamedEntityCacheFactory extends AbstractEntityCacheFactory {
+public class EntityCacheFactory implements CacheFactory {
- private String nameCacheName;
+ protected final KapuaCacheManager cacheManager;
+ protected final CommonsMetric commonsMetric;
- public AbstractNamedEntityCacheFactory(String idCacheName, String nameCacheName) {
- super(idCacheName);
- this.nameCacheName = nameCacheName;
- }
-
- public String getEntityNameCacheName() {
- return nameCacheName;
+ @Inject
+ public EntityCacheFactory(KapuaCacheManager cacheManager, CommonsMetric commonsMetric) {
+ this.cacheManager = cacheManager;
+ this.commonsMetric = commonsMetric;
}
@Override
- public EntityCache createCache() {
- return new NamedEntityCache(getEntityIdCacheName(), getEntityNameCacheName());
+ public EntityCache createCache(String idCacheName) {
+ return new EntityCache(cacheManager, commonsMetric, idCacheName);
}
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/jpa/KapuaEntityManagerFactory.java b/commons/src/main/java/org/eclipse/kapua/commons/jpa/KapuaEntityManagerFactory.java
index 0e8295c5024..afd63d7e211 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/jpa/KapuaEntityManagerFactory.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/jpa/KapuaEntityManagerFactory.java
@@ -40,9 +40,9 @@
*/
public class KapuaEntityManagerFactory implements EntityManagerFactory {
private static final Logger LOG = LoggerFactory.getLogger(KapuaEntityManagerFactory.class);
- private static final SystemSetting SYSTEM_SETTING = SystemSetting.getInstance();
private static final String DEFAULT_DATASOURCE_NAME = "kapua-dbpool";
private final EntityManagerFactory entityManagerFactory;
+ private final SystemSetting systemSetting = SystemSetting.getInstance();
/**
* Constructor.
@@ -70,7 +70,7 @@ public KapuaEntityManagerFactory(String persistenceUnitName, String datasourceNa
configOverrides.put(PersistenceUnitProperties.CACHE_SHARED_DEFAULT, "false");
configOverrides.put(PersistenceUnitProperties.NON_JTA_DATASOURCE, DataSource.getDataSource());
- final String targetDatabase = SYSTEM_SETTING.getString(SystemSettingKey.DB_JDBC_DATABASE_TARGET);
+ final String targetDatabase = systemSetting.getString(SystemSettingKey.DB_JDBC_DATABASE_TARGET);
if (!Strings.isNullOrEmpty(targetDatabase)) {
configOverrides.put(PersistenceUnitProperties.TARGET_DATABASE, targetDatabase);
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/jpa/AbstractEntityCacheFactory.java b/commons/src/main/java/org/eclipse/kapua/commons/jpa/NamedCacheFactory.java
similarity index 61%
rename from commons/src/main/java/org/eclipse/kapua/commons/jpa/AbstractEntityCacheFactory.java
rename to commons/src/main/java/org/eclipse/kapua/commons/jpa/NamedCacheFactory.java
index f6f31b2a560..2c2323c13e7 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/jpa/AbstractEntityCacheFactory.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/jpa/NamedCacheFactory.java
@@ -13,21 +13,17 @@
package org.eclipse.kapua.commons.jpa;
import org.eclipse.kapua.commons.service.internal.cache.EntityCache;
+import org.eclipse.kapua.commons.service.internal.cache.NamedEntityCache;
-public abstract class AbstractEntityCacheFactory implements CacheFactory {
+/**
+ * Cache factory definition
+ */
+public interface NamedCacheFactory {
- private String idCacheName;
-
- public AbstractEntityCacheFactory(String idCacheName) {
- this.idCacheName = idCacheName;
- }
-
- public String getEntityIdCacheName() {
- return idCacheName;
- }
-
- @Override
- public EntityCache createCache() {
- return new EntityCache(getEntityIdCacheName());
- }
+ /**
+ * Creates the cache for the given service.
+ *
+ * @return an {@link EntityCache} instance.
+ */
+ NamedEntityCache createCache(String idCacheName, String nameCacheName);
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/jpa/NamedEntityCacheFactory.java b/commons/src/main/java/org/eclipse/kapua/commons/jpa/NamedEntityCacheFactory.java
new file mode 100644
index 00000000000..4daa5fbb738
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/jpa/NamedEntityCacheFactory.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * 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.commons.jpa;
+
+import com.google.inject.Inject;
+import org.eclipse.kapua.commons.metric.CommonsMetric;
+import org.eclipse.kapua.commons.service.internal.cache.KapuaCacheManager;
+import org.eclipse.kapua.commons.service.internal.cache.NamedEntityCache;
+
+public class NamedEntityCacheFactory implements NamedCacheFactory {
+
+ protected final KapuaCacheManager cacheManager;
+ protected final CommonsMetric commonsMetric;
+
+ @Inject
+ public NamedEntityCacheFactory(KapuaCacheManager cacheManager, CommonsMetric commonsMetric) {
+ this.cacheManager = cacheManager;
+ this.commonsMetric = commonsMetric;
+ }
+
+ @Override
+ public NamedEntityCache createCache(String idCacheName, String nameCacheName) {
+ return new NamedEntityCache(this.cacheManager, this.commonsMetric, idCacheName, nameCacheName);
+ }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/jpa/SecretAttributeConverter.java b/commons/src/main/java/org/eclipse/kapua/commons/jpa/SecretAttributeConverter.java
index cbc2d4cd3f9..cd6bb7f02f0 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/jpa/SecretAttributeConverter.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/jpa/SecretAttributeConverter.java
@@ -16,6 +16,7 @@
import org.eclipse.kapua.commons.crypto.CryptoUtil;
import org.eclipse.kapua.commons.crypto.exception.AesDecryptionException;
import org.eclipse.kapua.commons.crypto.exception.AesEncryptionException;
+import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.model.KapuaEntityAttributes;
import javax.persistence.AttributeConverter;
@@ -31,6 +32,7 @@
public class SecretAttributeConverter implements AttributeConverter {
private static final String AES_V1 = "$aes$";
+ private final CryptoUtil cryptoUtil = KapuaLocator.getInstance().getComponent(CryptoUtil.class);
@Override
public String convertToDatabaseColumn(String entityAttribute) {
@@ -39,7 +41,7 @@ public String convertToDatabaseColumn(String entityAttribute) {
}
try {
- return AES_V1 + CryptoUtil.encryptAes(entityAttribute);
+ return AES_V1 + cryptoUtil.encryptAes(entityAttribute);
} catch (AesEncryptionException e) {
throw new PersistenceException("Cannot write value to database", e);
}
@@ -54,7 +56,7 @@ public String convertToEntityAttribute(String databaseValue) {
// Handling encryption versions
if (databaseValue.startsWith(AES_V1)) {
try {
- return CryptoUtil.decryptAes(databaseValue.substring(AES_V1.length()));
+ return cryptoUtil.decryptAes(databaseValue.substring(AES_V1.length()));
} catch (AesDecryptionException e) {
throw new PersistenceException("Cannot read value from database", e);
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/liquibase/DatabaseCheckUpdate.java b/commons/src/main/java/org/eclipse/kapua/commons/liquibase/DatabaseCheckUpdate.java
new file mode 100644
index 00000000000..8b434286582
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/liquibase/DatabaseCheckUpdate.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.commons.liquibase;
+
+import com.google.common.base.MoreObjects;
+import org.eclipse.kapua.commons.jpa.JdbcConnectionUrlResolvers;
+import org.eclipse.kapua.commons.populators.DataPopulatorRunner;
+import org.eclipse.kapua.commons.setting.system.SystemSetting;
+import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+
+/**
+ * Call Liquibase database schema check and update (if enabled)
+ */
+public class DatabaseCheckUpdate {
+
+ private static final Logger logger = LoggerFactory.getLogger(DatabaseCheckUpdate.class);
+
+ @Inject
+ public DatabaseCheckUpdate(SystemSetting systemSetting, DataPopulatorRunner dataPopulatorRunner) {
+ logger.info("Kapua database schema check and update...");
+ try {
+ final boolean runLiquibase = systemSetting.getBoolean(SystemSettingKey.DB_SCHEMA_UPDATE, false);
+ if (runLiquibase) {
+ logger.info("Initialize Kapua Liquibase configuration...");
+ final String dbUsername = systemSetting.getString(SystemSettingKey.DB_USERNAME);
+ final String dbPassword = systemSetting.getString(SystemSettingKey.DB_PASSWORD);
+ final String schema = MoreObjects.firstNonNull(
+ systemSetting.getString(SystemSettingKey.DB_SCHEMA_ENV),
+ systemSetting.getString(SystemSettingKey.DB_SCHEMA)
+ );
+
+ // Try initialize JDBC Driver
+ final String jdbcDriverName = systemSetting.getString(SystemSettingKey.DB_JDBC_DRIVER);
+ try {
+ Class.forName(jdbcDriverName);
+ } catch (ClassNotFoundException e) {
+ logger.warn("Could not find/load JDBC driver: {}. Subsequent errors may be expected...", jdbcDriverName);
+ }
+
+ final String jdbcUrl = JdbcConnectionUrlResolvers.resolveJdbcUrl();
+ logger.info("Initialize Kapua Liquibase configuration... DONE! ");
+
+ final KapuaLiquibaseClient liquibaseClient = new KapuaLiquibaseClient(jdbcUrl, dbUsername, dbPassword, schema);
+ liquibaseClient.update();
+ } else {
+ logger.warn("Skipping Kapua Liquibase Client as per configured property! {}=false", SystemSettingKey.DB_SCHEMA_UPDATE);
+ }
+ dataPopulatorRunner.runPopulators();
+ } catch (Exception e) {
+ logger.error("Kapua database schema check and update... ERROR: {}", e.getMessage(), e);
+ throw new SecurityException(e);
+ }
+ }
+
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/liquibase/KapuaLiquibaseClient.java b/commons/src/main/java/org/eclipse/kapua/commons/liquibase/KapuaLiquibaseClient.java
index a6b6664bba3..380e7235876 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/liquibase/KapuaLiquibaseClient.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/liquibase/KapuaLiquibaseClient.java
@@ -28,7 +28,7 @@
import org.eclipse.kapua.commons.util.SemanticVersion;
import org.eclipse.kapua.commons.util.log.ConfigurationPrinter;
import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.Scanners;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@ public class KapuaLiquibaseClient {
private static final SemanticVersion LIQUIBASE_TIMESTAMP_FIX_VERSION = new SemanticVersion("3.3.3"); // https://liquibase.jira.com/browse/CORE-1958
- private static final LiquibaseClientSettings LIQUIBASE_CLIENT_SETTINGS = LiquibaseClientSettings.getInstance();
+ private final LiquibaseClientSettings liquibaseClientSettings = new LiquibaseClientSettings();
private final String jdbcUrl;
private final String username;
@@ -111,8 +111,8 @@ public KapuaLiquibaseClient(String jdbcUrl, String username, String password, St
this.schema = schema;
// Check wether or not fix the timestamp based on Liquibase version
- boolean forceTimestampFix = LIQUIBASE_CLIENT_SETTINGS.getBoolean(LiquibaseClientSettingKeys.FORCE_TIMESTAMPS_FIX);
- String currentLiquibaseVersionString = LIQUIBASE_CLIENT_SETTINGS.getString(LiquibaseClientSettingKeys.LIQUIBASE_VERSION);
+ boolean forceTimestampFix = liquibaseClientSettings.getBoolean(LiquibaseClientSettingKeys.FORCE_TIMESTAMPS_FIX);
+ String currentLiquibaseVersionString = liquibaseClientSettings.getString(LiquibaseClientSettingKeys.LIQUIBASE_VERSION);
SemanticVersion currentLiquibaseVersion = new SemanticVersion(currentLiquibaseVersionString);
runTimestampsFix = (currentLiquibaseVersion.afterOrMatches(LIQUIBASE_TIMESTAMP_FIX_VERSION) || forceTimestampFix);
@@ -192,7 +192,7 @@ protected static synchronized File loadChangelogs() throws IOException {
boolean createdTmp = changelogTempDirectory.mkdirs();
LOG.trace("{} Tmp dir: {}", createdTmp ? "Created" : "Using", changelogTempDirectory.getAbsolutePath());
- Reflections reflections = new Reflections("liquibase", new ResourcesScanner());
+ Reflections reflections = new Reflections("liquibase", Scanners.Resources);
Set changeLogs = reflections.getResources(Pattern.compile(".*\\.xml|.*\\.sql"));
for (String script : changeLogs) {
URL scriptUrl = KapuaLiquibaseClient.class.getResource("/" + script);
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/liquibase/settings/LiquibaseClientSettings.java b/commons/src/main/java/org/eclipse/kapua/commons/liquibase/settings/LiquibaseClientSettings.java
index 4ee9bf3be15..d50e4a146db 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/liquibase/settings/LiquibaseClientSettings.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/liquibase/settings/LiquibaseClientSettings.java
@@ -21,25 +21,14 @@ public class LiquibaseClientSettings extends AbstractKapuaSetting Who knows?
+ * @deprecated since 2.0.0 - this was probably intended to be part of a larger abstraction that never came to fruition - as it is now it just creates confusion.
+ * Do not use, will be removed in future releases
+ */
+@Deprecated
public abstract class EventHandler {
private static Logger logger = LoggerFactory.getLogger(EventHandler.class);
+ private final CommonsMetric commonsMetric;
private boolean running;
private ExecutorWrapper executorWrapper;
@@ -32,21 +39,21 @@ public abstract class EventHandler {
private BlockingQueue eventQueue = new LinkedBlockingDeque<>(MAX_ONGOING_OPERATION);
private EventProcessor eventProcessor;
- protected EventHandler(String name, long initialDelay, long pollTimeout) {
+ protected EventHandler(CommonsMetric commonsMetric, String name, long initialDelay, long pollTimeout) {
+ this.commonsMetric = commonsMetric;
executorWrapper = new ExecutorWrapper(name, () -> {
while (isRunning()) {
try {
O eventBean = eventQueue.poll(POLL_TIMEOUT, TimeUnit.MILLISECONDS);
- if (eventBean!=null) {
- CommonsMetric.getInstance().getDequeuedEvent().inc();
+ if (eventBean != null) {
+ commonsMetric.getDequeuedEvent().inc();
eventProcessor.processEvent(eventBean);
- CommonsMetric.getInstance().getProcessedEvent().inc();
+ commonsMetric.getProcessedEvent().inc();
}
} catch (InterruptedException e) {
//do nothing...
Thread.currentThread().interrupt();
- }
- catch (Exception e) {
+ } catch (Exception e) {
//do nothing
logger.error("Error while processing event: {}", e.getMessage(), e);
//TODO add metric?
@@ -57,7 +64,7 @@ protected EventHandler(String name, long initialDelay, long pollTimeout) {
public void enqueueEvent(O eventBean) {
eventQueue.add(eventBean);
- CommonsMetric.getInstance().getEnqueuedEvent().inc();
+ commonsMetric.getEnqueuedEvent().inc();
}
public void registerConsumer(EventProcessor eventProcessor) {
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonMetricsModule.java b/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonMetricsModule.java
new file mode 100644
index 00000000000..d5aceaaa59e
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonMetricsModule.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.commons.metric;
+
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.SharedMetricRegistries;
+import com.google.inject.Provides;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Singleton;
+
+public class CommonMetricsModule extends AbstractKapuaModule {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Override
+ protected void configureModule() {
+ bind(MetricsService.class).to(MetricsServiceImpl.class).in(Singleton.class);
+ bind(CommonsMetric.class).in(Singleton.class);
+ }
+
+ @Provides
+ @Singleton
+ MetricRegistry metricRegistry() {
+ try {
+ final MetricRegistry metricRegistry = SharedMetricRegistries.getDefault();
+ logger.info("Default Metric Registry loaded");
+ return metricRegistry;
+ } catch (IllegalStateException e) {
+ logger.warn("Unable to load Default Metric Registry - creating a new one");
+ return new MetricRegistry();
+ }
+ }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonsMetric.java b/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonsMetric.java
index 553658e3a9e..dc5a4ddeec8 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonsMetric.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/metric/CommonsMetric.java
@@ -12,24 +12,24 @@
*******************************************************************************/
package org.eclipse.kapua.commons.metric;
+import com.codahale.metrics.Counter;
import org.eclipse.kapua.KapuaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.codahale.metrics.Counter;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
/**
* Helper class to handle commons metrics.
- * TODO inject when injection will be available
- *
*/
+@Singleton
public class CommonsMetric {
private static final Logger logger = LoggerFactory.getLogger(CommonsMetric.class);
- //TODO this value should be injected instead of set by the application entrypoint!
- //TODO to be injected!!!
- public static String module = "undefined";
+ private final String module;
//cache
private static final String CACHE_MANAGER = "cache_manager";
private Integer cacheStatus = new Integer(0);
@@ -58,22 +58,10 @@ public class CommonsMetric {
private Counter enqueuedEvent;
private Counter dequeuedEvent;
- private static CommonsMetric instance;
-
- public synchronized static CommonsMetric getInstance() {
- if (instance == null) {
- try {
- instance = new CommonsMetric();
- } catch (KapuaException e) {
- //TODO throw runtime exception
- logger.error("Creating metrics error: {}", e.getMessage(), e);
- }
- }
- return instance;
- }
-
- private CommonsMetric() throws KapuaException {
- MetricsService metricsService = MetricServiceFactory.getInstance();
+ @Inject
+ public CommonsMetric(MetricsService metricsService,
+ @Named("metricModuleName") String metricModuleName) throws KapuaException {
+ this.module = metricModuleName;
metricsService.registerGauge(() -> cacheStatus, module, CACHE_MANAGER, "cache_status");
registeredCache = metricsService.getCounter(module, CACHE_MANAGER, "available_cache");
@@ -93,6 +81,10 @@ private CommonsMetric() throws KapuaException {
enqueuedEvent = metricsService.getCounter(module, EVENT, "enqueued");
}
+ public String getModule() {
+ return module;
+ }
+
//TODO should be synchronized?
public void setCacheStatus(int value) {
cacheStatus = value;
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsService.java b/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsService.java
index c3362825a32..8f6960aa25c 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsService.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsService.java
@@ -12,20 +12,17 @@
*******************************************************************************/
package org.eclipse.kapua.commons.metric;
-import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.service.KapuaService;
-
import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Histogram;
-import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.service.KapuaService;
/**
* Metric service definition
*
* @since 1.0
- *
*/
public interface MetricsService extends KapuaService {
@@ -65,16 +62,8 @@ public interface MetricsService extends KapuaService {
* @param module
* @param component
* @param names
- * @throws KapuaException
- * if the metric is already defined
+ * @throws KapuaException if the metric is already defined
*/
public void registerGauge(Gauge gauge, String module, String component, String... names) throws KapuaException;
- /**
- * Return the MetricRegistry containing all the metrics
- *
- * @return MetricRegistry
- */
- public MetricRegistry getMetricRegistry();
-
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsServiceImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsServiceImpl.java
index e6cec3415b8..96aee8b91b0 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsServiceImpl.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/metric/MetricsServiceImpl.java
@@ -18,7 +18,6 @@
import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.JmxReporter.Builder;
import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.SharedMetricRegistries;
import com.codahale.metrics.Timer;
import org.eclipse.kapua.KapuaException;
import org.eclipse.kapua.commons.setting.system.SystemSetting;
@@ -26,6 +25,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.inject.Inject;
import java.text.MessageFormat;
import java.util.concurrent.TimeUnit;
@@ -54,14 +54,9 @@ enum MetricType {
/**
* Default metric service constructor
*/
- MetricsServiceImpl() {
- try {
- metricRegistry = SharedMetricRegistries.getDefault();
- logger.info("Default Metric Registry loaded");
- } catch (IllegalStateException e) {
- metricRegistry = new MetricRegistry();
- logger.warn("Unable to load Default Metric Registry - creating a new one");
- }
+ @Inject
+ public MetricsServiceImpl(MetricRegistry metricRegistry) {
+ this.metricRegistry = metricRegistry;
if (isJmxEnabled()) {
enableJmxSupport();
@@ -81,11 +76,6 @@ private void enableJmxSupport() {
*/
}
- @Override
- public MetricRegistry getMetricRegistry() {
- return metricRegistry;
- }
-
@Override
public Counter getCounter(String module, String component, String... names) {
String name = getMetricName(MetricType.count, module, component, names);
@@ -142,10 +132,9 @@ private String getMetricName(String module, String component, String... metricsN
* @return
*/
private String getMetricName(MetricType metricType, String module, String component, String... metricsName) {
- if (metricsName==null || metricsName.length<=0) {
- return MessageFormat.format(METRICS_SHORT_NAME_FORMAT, module, component, metricType!=null ? SEPARATOR + metricType.name() : "");
- }
- else {
+ if (metricsName == null || metricsName.length <= 0) {
+ return MessageFormat.format(METRICS_SHORT_NAME_FORMAT, module, component, metricType != null ? SEPARATOR + metricType.name() : "");
+ } else {
return MessageFormat.format(METRICS_NAME_FORMAT, module, component, convertToDotNotation(metricType, metricsName));
}
}
@@ -166,7 +155,7 @@ private String convertToDotNotation(MetricType metricType, String... metricsName
firstMetricName = false;
builder.append(s);
}
- if (metricType!=null) {
+ if (metricType != null) {
builder.append(SEPARATOR).append(metricType.name());
}
return builder.toString();
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/model/id/KapuaEid.java b/commons/src/main/java/org/eclipse/kapua/commons/model/id/KapuaEid.java
index 0342b2f0737..60b2fff760c 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/model/id/KapuaEid.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/model/id/KapuaEid.java
@@ -18,6 +18,7 @@
import java.io.Serializable;
import java.math.BigInteger;
import java.util.Base64;
+import java.util.Optional;
/**
* {@link KapuaId} implementation.
@@ -72,7 +73,11 @@ public KapuaEid(KapuaId id) {
* @since 1.0.0
*/
public static KapuaEid parseKapuaId(KapuaId kapuaId) {
- return kapuaId != null ? (kapuaId instanceof KapuaEid ? (KapuaEid) kapuaId : new KapuaEid(kapuaId)) : null;
+ return Optional.ofNullable(kapuaId)
+ .map(kId -> kId instanceof KapuaEid
+ ? (KapuaEid) kId
+ : new KapuaEid(kId))
+ .orElse(null);
}
/**
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 863e873a98e..39fd356fa6b 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,16 +12,14 @@
*******************************************************************************/
package org.eclipse.kapua.commons.service.event.store.api;
-import javax.xml.bind.annotation.XmlRegistry;
+import org.eclipse.kapua.commons.service.event.store.internal.EventStoreFactoryImpl;
-import org.eclipse.kapua.locator.KapuaLocator;
+import javax.xml.bind.annotation.XmlRegistry;
@XmlRegistry
public class EventStoreXmlRegistry {
-
- private final KapuaLocator locator = KapuaLocator.getInstance();
- private final EventStoreFactory kapuaEventFactory = locator.getFactory(EventStoreFactory.class);
+ private final EventStoreFactory kapuaEventFactory = new EventStoreFactoryImpl();
/**
* Creates a new kapuaEvent instance
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/CommonsServiceEventModule.java b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/CommonsServiceEventModule.java
index 7889277d610..b77724078fe 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/CommonsServiceEventModule.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/event/store/internal/CommonsServiceEventModule.java
@@ -12,12 +12,24 @@
*******************************************************************************/
package org.eclipse.kapua.commons.service.event.store.internal;
+import com.google.inject.Provides;
import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
import org.eclipse.kapua.commons.service.event.store.api.EventStoreFactory;
+import org.eclipse.kapua.storage.TxManager;
+
+import javax.inject.Named;
public class CommonsServiceEventModule extends AbstractKapuaModule {
@Override
protected void configureModule() {
bind(EventStoreFactory.class).to(EventStoreFactoryImpl.class);
}
+
+ @Provides
+ @Named("kapuaEventsTxManager")
+ TxManager kapuaEventsTxManager(@Named("maxInsertAttempts") Integer maxInsertAttempts) {
+ return new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-events");
+ }
+
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/AbstractKapuaService.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/AbstractKapuaService.java
index a9bd84db9d1..8e0920ba236 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/AbstractKapuaService.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/AbstractKapuaService.java
@@ -12,14 +12,14 @@
*******************************************************************************/
package org.eclipse.kapua.commons.service.internal;
-import org.eclipse.kapua.commons.event.ServiceEventBusManager;
-import org.eclipse.kapua.commons.jpa.AbstractEntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
import org.eclipse.kapua.commons.jpa.EntityManagerFactory;
import org.eclipse.kapua.commons.jpa.EntityManagerSession;
import org.eclipse.kapua.commons.service.internal.cache.EntityCache;
import org.eclipse.kapua.event.ServiceEventBus;
import org.eclipse.kapua.event.ServiceEventBusException;
import org.eclipse.kapua.event.ServiceEventBusListener;
+import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.service.KapuaService;
import javax.validation.constraints.NotNull;
@@ -39,13 +39,14 @@ public abstract class AbstractKapuaService implements KapuaService {
protected final EntityManagerFactory entityManagerFactory;
protected final EntityManagerSession entityManagerSession;
protected final EntityCache entityCache;
+ private final ServiceEventBus serviceEventBus = KapuaLocator.getInstance().getComponent(ServiceEventBus.class);
/**
* Constructor
*
* @param entityManagerFactory The {@link EntityManagerFactory}.
* @since 1.0.0
- * @deprecated Since 1.2.0. Please make use of {@link #AbstractKapuaService(EntityManagerFactory, AbstractEntityCacheFactory)}. This constructor will be removed in a next release (may be).
+ * @deprecated Since 1.2.0. Please make use of {@link #AbstractKapuaService(EntityManagerFactory, EntityCacheFactory)}. This constructor will be removed in a next release (may be).
*/
@Deprecated
protected AbstractKapuaService(@NotNull EntityManagerFactory entityManagerFactory) {
@@ -56,15 +57,15 @@ protected AbstractKapuaService(@NotNull EntityManagerFactory entityManagerFactor
* Constructor.
*
* @param entityManagerFactory The {@link EntityManagerFactory}.
- * @param abstractCacheFactory The {@link AbstractEntityCacheFactory}.
+ * @param entityCacheFactory The {@link EntityCacheFactory}.
* @since 1.2.0
*/
- protected AbstractKapuaService(@NotNull EntityManagerFactory entityManagerFactory, AbstractEntityCacheFactory abstractCacheFactory) {
+ protected AbstractKapuaService(@NotNull EntityManagerFactory entityManagerFactory, EntityCacheFactory entityCacheFactory) {
this.entityManagerFactory = entityManagerFactory;
this.entityManagerSession = new EntityManagerSession(entityManagerFactory);
- if (abstractCacheFactory != null) {
- this.entityCache = abstractCacheFactory.createCache();
+ if (entityCacheFactory != null) {
+ this.entityCache = entityCacheFactory.createCache("Deprecated");
} else {
this.entityCache = null;
}
@@ -87,9 +88,9 @@ public EntityManagerSession getEntityManagerSession() {
* @param address The {@link ServiceEventBus} address to subscribe to.
* @param clazz The {@link KapuaService} owner of the {@link ServiceEventBusListener}.
* @throws ServiceEventBusException If any error occurs during subscription to the address.
- * @since 1.0.0
+ * @since 1.0.0kapua-sew
*/
protected void registerEventListener(@NotNull ServiceEventBusListener listener, @NotNull String address, @NotNull Class clazz) throws ServiceEventBusException {
- ServiceEventBusManager.getInstance().subscribe(address, clazz.getName(), listener);
+ serviceEventBus.subscribe(address, clazz.getName(), listener);
}
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/CacheManagerProvider.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/CacheManagerProvider.java
new file mode 100644
index 00000000000..b4ca8db49a5
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/CacheManagerProvider.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * 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.commons.service.internal.cache;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.kapua.KapuaErrorCodes;
+import org.eclipse.kapua.KapuaRuntimeException;
+import org.eclipse.kapua.commons.metric.CommonsMetric;
+import org.eclipse.kapua.commons.setting.KapuaSettingException;
+import org.eclipse.kapua.commons.setting.system.SystemSetting;
+import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
+import org.eclipse.kapua.commons.util.KapuaFileUtils;
+import org.eclipse.kapua.commons.util.log.ConfigurationPrinter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.cache.CacheException;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.spi.CachingProvider;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+
+public class CacheManagerProvider implements Provider {
+ private static final String DEFAULT_CACHING_PROVIDER_CLASS_NAME = "org.eclipse.kapua.commons.service.internal.cache.dummy.CachingProvider";
+ private final CommonsMetric commonsMetric;
+ private final String cachingProviderClassName;
+ private final long ttl;
+ private final String expiryPolicy;
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Inject
+ public CacheManagerProvider(CommonsMetric commonsMetric, SystemSetting systemSetting) {
+ this.commonsMetric = commonsMetric;
+ this.cachingProviderClassName = systemSetting.getString(SystemSettingKey.CACHING_PROVIDER);
+ this.ttl = systemSetting.getLong(SystemSettingKey.CACHE_TTL, 60);
+ this.expiryPolicy = systemSetting.getString(SystemSettingKey.JCACHE_EXPIRY_POLICY, KapuaCacheManager.ExpiryPolicy.MODIFIED.name());
+ }
+
+ @Override
+ public CacheManager get() {
+ CachingProvider cachingProvider;
+ final URI cacheConfigUri = getCacheConfig();
+ try {
+ if (!StringUtils.isEmpty(cachingProviderClassName)) {
+ cachingProvider = Caching.getCachingProvider(cachingProviderClassName);
+ } else {
+ cachingProvider = Caching.getCachingProvider();
+ }
+ //set the default cache flag
+ commonsMetric.setCacheStatus(1);
+ } catch (CacheException e) {
+ //set the "default cache" flag (already done by initDefualtCacheProvider)
+ logger.warn("Error while loading the CachingProvider... Loading the default one ({}).", DEFAULT_CACHING_PROVIDER_CLASS_NAME);
+ cachingProvider = initDefaultCacheProvider();
+ }
+ try {
+ return cachingProvider.getCacheManager(cacheConfigUri, null);
+ } catch (Exception e) {
+ //anyway set the "default cache" flag (already done by initDefualtCacheProvider)
+ //second fallback
+ logger.warn("Error while loading the CacheManager... Switching to CachingProvider default ({}). Error: {}", DEFAULT_CACHING_PROVIDER_CLASS_NAME, e.getMessage(), e);
+ cachingProvider = initDefaultCacheProvider();
+ return cachingProvider.getCacheManager(cacheConfigUri, null);
+ }
+ }
+
+ /**
+ * Gets the URI with the cache config file path.
+ *
+ * @return the URI with the cache config file path
+ */
+ private URI getCacheConfig() {
+ String configurationFileName = SystemSetting.getInstance().getString(SystemSettingKey.CACHE_CONFIG_URL);
+
+ URI uri = null;
+ if (configurationFileName != null) {
+ try {
+ uri = KapuaFileUtils.getAsURL(configurationFileName).toURI();
+ } catch (KapuaSettingException | URISyntaxException e) {
+ throw new KapuaRuntimeException(KapuaErrorCodes.INTERNAL_ERROR, e, String.format("Unable to load cache config file (%s)", configurationFileName));
+ }
+ }
+
+ // Print configuration
+ ConfigurationPrinter
+ .create()
+ .withLogger(logger)
+ .withLogLevel(ConfigurationPrinter.LogLevel.INFO)
+ .withTitle("Cache Configuration")
+ .addParameter("Caching provider class name", cachingProviderClassName)
+ .addParameter("Default caching provider class name", DEFAULT_CACHING_PROVIDER_CLASS_NAME)
+ .addParameter("TTL", ttl)
+ .addParameter("Expiry Policy", expiryPolicy)
+ .addParameter("Config URI", uri)
+ .printLog();
+
+ return uri;
+ }
+
+ private CachingProvider initDefaultCacheProvider() {
+ //set the default cache flag
+ commonsMetric.setCacheStatus(-1);
+ return Caching.getCachingProvider(DEFAULT_CACHING_PROVIDER_CLASS_NAME);
+ }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/CacheModule.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/CacheModule.java
new file mode 100644
index 00000000000..21b81fdded0
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/CacheModule.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.commons.service.internal.cache;
+
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.NamedCacheFactory;
+import org.eclipse.kapua.commons.jpa.NamedEntityCacheFactory;
+
+import javax.cache.CacheManager;
+import javax.inject.Singleton;
+
+public class CacheModule extends AbstractKapuaModule {
+ @Override
+ protected void configureModule() {
+ bind(CacheManager.class).toProvider(CacheManagerProvider.class).in(Singleton.class);
+ bind(KapuaCacheManager.class).in(Singleton.class);
+ bind(NamedCacheFactory.class).to(NamedEntityCacheFactory.class).in(Singleton.class);
+ }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/ComposedKey.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/ComposedKey.java
index 73cbb730adb..35c5ab4b438 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/ComposedKey.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/ComposedKey.java
@@ -59,4 +59,11 @@ public Serializable getKey() {
return key;
}
+ @Override
+ public String toString() {
+ return "ComposedKey{" +
+ "scopeId=" + scopeId +
+ ", key=" + key +
+ '}';
+ }
}
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 1ea4721c54b..9a49271b7ec 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
@@ -32,15 +32,17 @@ public class EntityCache {
protected Cache idCache;
protected Cache listsCache; // listsCache does not use the same keys as idCache
+ private final CommonsMetric commonsMetric;
/**
* The constructor initializes the {@link #idCache} and the {@link #listsCache}.
*
* @param idCacheName
*/
- public EntityCache(String idCacheName) {
- idCache = KapuaCacheManager.getCache(idCacheName);
- listsCache = KapuaCacheManager.getCache(idCacheName + "_list");
+ public EntityCache(KapuaCacheManager cacheManager, CommonsMetric commonsMetric, String idCacheName) {
+ this.idCache = cacheManager.getCache(idCacheName);
+ this.listsCache = cacheManager.getCache(idCacheName + "_list");
+ this.commonsMetric = commonsMetric;
}
public KapuaEntity get(KapuaId scopeId, KapuaId kapuaId) {
@@ -53,9 +55,9 @@ public KapuaEntity get(KapuaId scopeId, KapuaId kapuaId) {
cacheErrorLogger("get", idCache.getName(), kapuaId, e);
}
if (entity == null) {
- CommonsMetric.getInstance().getCacheMiss().inc();
+ commonsMetric.getCacheMiss().inc();
} else {
- CommonsMetric.getInstance().getCacheHit().inc();
+ commonsMetric.getCacheHit().inc();
}
return entity;
}
@@ -104,7 +106,7 @@ public KapuaEntity remove(KapuaId scopeId, KapuaId kapuaId) {
if (entity != null) {
try {
idCache.remove(kapuaId);
- CommonsMetric.getInstance().getCacheRemoval().inc();
+ commonsMetric.getCacheRemoval().inc();
return entity;
} catch (Exception e) {
cacheErrorLogger("remove", idCache.getName(), kapuaId, e);
@@ -190,8 +192,8 @@ protected KapuaListResult checkResult(KapuaId scopeId, KapuaListResult entity) {
* @param t the exception
*/
protected void cacheErrorLogger(String operation, String cacheName, Serializable keyId, Throwable t) {
- CommonsMetric.getInstance().getCacheError().inc();
+ commonsMetric.getCacheError().inc();
LOGGER.warn("Cache error while performing {} on {} for key {} : {}", operation, cacheName, keyId, t.getLocalizedMessage());
- LOGGER.debug("Cache exception", t);
+ LOGGER.error("Cache exception", t);
}
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManager.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManager.java
index 5bc13ce5a01..0a6ed7ad05f 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManager.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManager.java
@@ -12,31 +12,21 @@
*******************************************************************************/
package org.eclipse.kapua.commons.service.internal.cache;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.kapua.KapuaErrorCodes;
-import org.eclipse.kapua.KapuaRuntimeException;
+import com.google.inject.Inject;
import org.eclipse.kapua.commons.metric.CommonsMetric;
-import org.eclipse.kapua.commons.setting.KapuaSettingException;
import org.eclipse.kapua.commons.setting.system.SystemSetting;
import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
-import org.eclipse.kapua.commons.util.KapuaFileUtils;
-import org.eclipse.kapua.commons.util.log.ConfigurationPrinter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.cache.Cache;
-import javax.cache.CacheException;
import javax.cache.CacheManager;
-import javax.cache.Caching;
import javax.cache.configuration.Factory;
import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.Duration;
import javax.cache.expiry.ModifiedExpiryPolicy;
import javax.cache.expiry.TouchedExpiryPolicy;
-import javax.cache.spi.CachingProvider;
import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
@@ -54,50 +44,19 @@ enum ExpiryPolicy {
private static final Logger LOGGER = LoggerFactory.getLogger(KapuaCacheManager.class);
- private static final SystemSetting SYSTEM_SETTING = SystemSetting.getInstance();
- private static final String CACHING_PROVIDER_CLASS_NAME = SYSTEM_SETTING.getString(SystemSettingKey.CACHING_PROVIDER);
- private static final String DEFAULT_CACHING_PROVIDER_CLASS_NAME = "org.eclipse.kapua.commons.service.internal.cache.dummy.CachingProvider";
- private static final long TTL = SYSTEM_SETTING.getLong(SystemSettingKey.CACHE_TTL, 60);
- private static final String EXPIRY_POLICY = SYSTEM_SETTING.getString(SystemSettingKey.JCACHE_EXPIRY_POLICY, ExpiryPolicy.MODIFIED.name());
- private static final Map> CACHE_MAP = new ConcurrentHashMap<>();
- private static final URI CACHE_CONFIG_URI = getCacheConfig();
+ private final long ttl;
+ private final String expiryPolicy;
+ private final Map> cacheMap = new ConcurrentHashMap<>();
- private static CacheManager cacheManager;
+ private final CacheManager cacheManager;
+ private final CommonsMetric commonsMetric;
- private KapuaCacheManager() {
- }
-
- /**
- * Gets the URI with the cache config file path.
- *
- * @return the URI with the cache config file path
- */
- private static URI getCacheConfig() {
- String configurationFileName = SystemSetting.getInstance().getString(SystemSettingKey.CACHE_CONFIG_URL);
-
- URI uri = null;
- if (configurationFileName != null) {
- try {
- uri = KapuaFileUtils.getAsURL(configurationFileName).toURI();
- } catch (KapuaSettingException | URISyntaxException e) {
- throw new KapuaRuntimeException(KapuaErrorCodes.INTERNAL_ERROR, e, String.format("Unable to load cache config file (%s)", configurationFileName));
- }
- }
-
- // Print configuration
- ConfigurationPrinter
- .create()
- .withLogger(LOGGER)
- .withLogLevel(ConfigurationPrinter.LogLevel.INFO)
- .withTitle("Cache Configuration")
- .addParameter("Caching provider class name", CACHING_PROVIDER_CLASS_NAME)
- .addParameter("Default caching provider class name", DEFAULT_CACHING_PROVIDER_CLASS_NAME)
- .addParameter("TTL", TTL)
- .addParameter("Expiry Policy", EXPIRY_POLICY)
- .addParameter("Config URI", uri)
- .printLog();
-
- return uri;
+ @Inject
+ public KapuaCacheManager(CacheManager cacheManager, CommonsMetric commonsMetric, SystemSetting systemSetting) {
+ this.cacheManager = cacheManager;
+ this.commonsMetric = commonsMetric;
+ this.ttl = systemSetting.getLong(SystemSettingKey.CACHE_TTL, 60);
+ this.expiryPolicy = systemSetting.getString(SystemSettingKey.JCACHE_EXPIRY_POLICY, ExpiryPolicy.MODIFIED.name());
}
/**
@@ -106,65 +65,34 @@ private static URI getCacheConfig() {
* @param cacheName the name of the cache.
* @return the Cache object containing the desired cache.
*/
- public static Cache getCache(String cacheName) {
- Cache cache = CACHE_MAP.get(cacheName);
+ public Cache getCache(String cacheName) {
+ Cache cache = cacheMap.get(cacheName);
if (cache == null) {
- synchronized (CACHE_MAP) {
- cache = CACHE_MAP.get(cacheName);
+ synchronized (cacheMap) {
+ cache = cacheMap.get(cacheName);
if (cache == null) {
- checkCacheManager();
- cache = cacheManager.createCache(cacheName, initConfig());
- CACHE_MAP.put(cacheName, cache);
- CommonsMetric.getInstance().getRegisteredCache().inc();
- LOGGER.info("Created cache: {} - Expiry Policy: {} - TTL: {}", cacheName, EXPIRY_POLICY, TTL);
+ final Cache fromManager = cacheManager.getCache(cacheName);
+ if (fromManager != null) {
+ cache = fromManager;
+ LOGGER.info("Retrived cache from manager: {}", cache);
+ } else {
+ cache = cacheManager.createCache(cacheName, initConfig());
+ commonsMetric.getRegisteredCache().inc();
+ LOGGER.info("Created cache: {} - Expiry Policy: {} - TTL: {}", cacheName, expiryPolicy, ttl);
+ }
+ cacheMap.put(cacheName, cache);
}
}
}
return cache;
}
-
- private static void checkCacheManager() {
- //called by synchronized section so no concurrency issues can arise
- if (cacheManager == null) {
- CachingProvider cachingProvider;
- try {
- if (!StringUtils.isEmpty(CACHING_PROVIDER_CLASS_NAME)) {
- cachingProvider = Caching.getCachingProvider(CACHING_PROVIDER_CLASS_NAME);
- } else {
- cachingProvider = Caching.getCachingProvider();
- }
- //set the default cache flag
- CommonsMetric.getInstance().setCacheStatus(1);
- } catch (CacheException e) {
- //set the "default cache" flag (already done by initDefualtCacheProvider)
- LOGGER.warn("Error while loading the CachingProvider... Loading the default one ({}).", DEFAULT_CACHING_PROVIDER_CLASS_NAME);
- cachingProvider = initDefualtCacheProvider();
- }
- try {
- cacheManager = cachingProvider.getCacheManager(CACHE_CONFIG_URI, null);
- } catch (Exception e) {
- //anyway set the "default cache" flag (already done by initDefualtCacheProvider)
- //second fallback
- LOGGER.warn("Error while loading the CacheManager... Switching to CachingProvider default ({}). Error: {}", DEFAULT_CACHING_PROVIDER_CLASS_NAME, e.getMessage(), e);
- cachingProvider = initDefualtCacheProvider();
- cacheManager = cachingProvider.getCacheManager(CACHE_CONFIG_URI, null);
- }
- }
- }
-
- private static CachingProvider initDefualtCacheProvider() {
- //set the default cache flag
- CommonsMetric.getInstance().setCacheStatus(-1);
- return Caching.getCachingProvider(DEFAULT_CACHING_PROVIDER_CLASS_NAME);
- }
-
- private static MutableConfiguration initConfig() {
+ private MutableConfiguration initConfig() {
Factory expiryPolicyFactory;
- if (ExpiryPolicy.TOUCHED.name().equals(EXPIRY_POLICY)) {
- expiryPolicyFactory = TouchedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, TTL));
+ if (ExpiryPolicy.TOUCHED.name().equals(expiryPolicy)) {
+ expiryPolicyFactory = TouchedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, ttl));
} else {
- expiryPolicyFactory = ModifiedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, TTL));
+ expiryPolicyFactory = ModifiedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, ttl));
}
MutableConfiguration config = new MutableConfiguration<>();
config.setExpiryPolicyFactory(expiryPolicyFactory);
@@ -174,11 +102,10 @@ private static MutableConfiguration initConfig() {
/**
* Utility method to cleanup the whole cache.
*/
- public static void invalidateAll() {
- CACHE_MAP.forEach((cacheKey, cache) -> {
+ public void invalidateAll() {
+ cacheMap.forEach((cacheKey, cache) -> {
cache.clear();
- CommonsMetric.getInstance().getRegisteredCache().dec();
+ commonsMetric.getRegisteredCache().dec();
});
}
-
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCache.java b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCache.java
index ea17a75a0f6..d16e86cb52c 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCache.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCache.java
@@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.kapua.commons.service.internal.cache;
+import org.eclipse.kapua.commons.metric.CommonsMetric;
import org.eclipse.kapua.model.KapuaEntity;
import org.eclipse.kapua.model.KapuaNamedEntity;
import org.eclipse.kapua.model.id.KapuaId;
@@ -28,9 +29,9 @@ public class NamedEntityCache extends EntityCache {
protected Cache nameCache;
- public NamedEntityCache(String idCacheName, String nameCacheName) {
- super(idCacheName);
- nameCache = KapuaCacheManager.getCache(nameCacheName);
+ public NamedEntityCache(KapuaCacheManager kapuaCacheManager, CommonsMetric commonsMetric, String idCacheName, String nameCacheName) {
+ super(kapuaCacheManager, commonsMetric, idCacheName);
+ nameCache = kapuaCacheManager.getCache(nameCacheName);
}
public KapuaEntity get(KapuaId scopeId, String name) {
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractBaseKapuaSetting.java b/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractBaseKapuaSetting.java
index ae1b356ecaf..52b4e3f8ffd 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractBaseKapuaSetting.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractBaseKapuaSetting.java
@@ -12,19 +12,18 @@
*******************************************************************************/
package org.eclipse.kapua.commons.setting;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.DataConfiguration;
+import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration.PropertyConverter;
+import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
+
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.DataConfiguration;
-import org.apache.commons.configuration.MapConfiguration;
-import org.apache.commons.configuration.PropertyConverter;
-
/**
* An abstract base class which does not make any assumptions on where the
* configuration comes from
@@ -51,9 +50,13 @@ public static AbstractBaseKapuaSetting fromMap(Map(new DataConfiguration(new MapConfiguration(map)));
}
- protected final DataConfiguration config;
+ protected DataConfiguration config;
public AbstractBaseKapuaSetting(final DataConfiguration dataConfiguration) {
+ init(dataConfiguration);
+ }
+
+ protected void init(final DataConfiguration dataConfiguration) {
this.config = dataConfiguration;
systemPropertyHotSwap = config.getBoolean(SystemSettingKey.SETTINGS_HOTSWAP.key(), false);
}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractKapuaSetting.java b/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractKapuaSetting.java
index 5467dffd82a..b49de0279a9 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractKapuaSetting.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/setting/AbstractKapuaSetting.java
@@ -49,6 +49,10 @@ protected AbstractKapuaSetting(String configResourceName) {
super(createCompositeSource(configResourceName));
}
+ public void reset(String configResourceName) {
+ super.init(createCompositeSource(configResourceName));
+ }
+
private static DataConfiguration createCompositeSource(String configResourceName) throws ExceptionInInitializerError {
CompositeConfiguration compositeConfig = new EnvFriendlyConfiguration();
compositeConfig.addConfiguration(new SystemConfiguration());
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/InMemoryTxContext.java b/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/InMemoryTxContext.java
new file mode 100644
index 00000000000..80eb24dbc75
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/InMemoryTxContext.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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.storage.memory;
+
+import org.eclipse.kapua.KapuaErrorCodes;
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.storage.TxContext;
+
+import java.io.IOException;
+
+public class InMemoryTxContext implements TxContext {
+ @Override
+ public void commit() {
+ //Nothing
+ }
+
+ @Override
+ public void rollback() {
+ //Nothing
+ }
+
+ @Override
+ public KapuaException convertPersistenceException(Exception e) {
+ return new KapuaException(KapuaErrorCodes.SEVERE_INTERNAL_ERROR, e);
+ }
+
+ @Override
+ public boolean isRecoverableException(Exception ex) {
+ return false;
+ }
+
+ @Override
+ public void close() throws IOException {
+ //Nothing
+ }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/KapuaEntityInMemoryRepository.java b/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/KapuaEntityInMemoryRepository.java
index 53c63b55db3..643a1896930 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/KapuaEntityInMemoryRepository.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/storage/memory/KapuaEntityInMemoryRepository.java
@@ -12,16 +12,19 @@
*******************************************************************************/
package org.eclipse.kapua.commons.storage.memory;
+import org.apache.commons.lang3.RandomUtils;
import org.eclipse.kapua.KapuaEntityNotFoundException;
import org.eclipse.kapua.KapuaException;
import org.eclipse.kapua.model.KapuaEntity;
import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.model.id.KapuaIdImpl;
import org.eclipse.kapua.model.query.FieldSortCriteria;
import org.eclipse.kapua.model.query.KapuaListResult;
import org.eclipse.kapua.model.query.KapuaQuery;
import org.eclipse.kapua.storage.KapuaEntityRepository;
import org.eclipse.kapua.storage.TxContext;
+import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -52,6 +55,9 @@ public KapuaEntityInMemoryRepository(Class clazz,
@Override
public E create(TxContext txContext, E entity) throws KapuaException {
+ if (entity.getId() == null) {
+ entity.setId(new KapuaIdImpl(BigInteger.valueOf(RandomUtils.nextLong(2, Long.MAX_VALUE))));
+ }
this.entities.add(entity);
return entity;
}
@@ -79,8 +85,8 @@ public L query(TxContext txContext, KapuaQuery kapuaQuery) throws KapuaException
res.addItems(this.entities
.stream()
.filter(e -> scopePredicate.test(e) && queryPredicate.test(e))
- .skip(kapuaQuery.getOffset())
- .limit(kapuaQuery.getLimit())
+ .skip(Optional.ofNullable(kapuaQuery.getOffset()).orElse(0))
+ .limit(Optional.ofNullable(kapuaQuery.getLimit()).orElse(this.entities.size()))
.sorted(createComparator(kapuaQuery))
.collect(Collectors.toList()));
return res;
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/util/RandomUtils.java b/commons/src/main/java/org/eclipse/kapua/commons/util/RandomUtils.java
index b8af06afa73..6bcbc29d7cc 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/util/RandomUtils.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/util/RandomUtils.java
@@ -28,6 +28,7 @@
*
* @since 1.2.0
*/
+//TODO: FIXME: promote from static utility to injectable collaborator
public class RandomUtils {
private static final Logger LOG = LoggerFactory.getLogger(RandomUtils.class);
diff --git a/commons/src/main/resources/META-INF/services/org.eclipse.kapua.commons.event.ServiceEventBusDriver b/commons/src/main/resources/META-INF/services/org.eclipse.kapua.commons.event.ServiceEventBusDriver
deleted file mode 100644
index e3b7d1e5261..00000000000
--- a/commons/src/main/resources/META-INF/services/org.eclipse.kapua.commons.event.ServiceEventBusDriver
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.kapua.commons.event.jms.JMSServiceEventBus
\ No newline at end of file
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/crypto/CryptoUtilTest.java b/commons/src/test/java/org/eclipse/kapua/commons/crypto/CryptoUtilImplTest.java
similarity index 76%
rename from commons/src/test/java/org/eclipse/kapua/commons/crypto/CryptoUtilTest.java
rename to commons/src/test/java/org/eclipse/kapua/commons/crypto/CryptoUtilImplTest.java
index b3d60a1e5b9..ba2e91679d1 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/crypto/CryptoUtilTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/crypto/CryptoUtilImplTest.java
@@ -15,6 +15,7 @@
import org.eclipse.kapua.commons.crypto.exception.AesDecryptionException;
import org.eclipse.kapua.commons.crypto.exception.AesEncryptionException;
import org.eclipse.kapua.commons.crypto.exception.InvalidSecretKeyRuntimeException;
+import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
import org.eclipse.kapua.qa.markers.junit.JUnitTests;
import org.junit.Assert;
import org.junit.Test;
@@ -29,15 +30,16 @@
*/
@Category(JUnitTests.class)
-public class CryptoUtilTest {
+public class CryptoUtilImplTest {
private static final String PLAIN_VALUE = "aPlainValue";
private static final String ALTERNATIVE_KEY = "alternativeKey!!";
+ private final CryptoUtil cryptoUtil = new CryptoUtilImpl(new CryptoSettings());
// SHA1
@Test
public void testSha1Hashing() throws NoSuchAlgorithmException {
- String hashedValue = CryptoUtil.sha1Hash(PLAIN_VALUE);
+ String hashedValue = cryptoUtil.sha1Hash(PLAIN_VALUE);
Assert.assertNotNull(hashedValue);
Assert.assertEquals("3VAfPtmZ+ldn8WsYl+hsDlITf+k=", hashedValue);
@@ -46,39 +48,39 @@ public void testSha1Hashing() throws NoSuchAlgorithmException {
@Test
public void testAesCryptDecrypt() throws AesEncryptionException, AesDecryptionException {
- String encryptedValue = CryptoUtil.encryptAes(PLAIN_VALUE);
+ String encryptedValue = cryptoUtil.encryptAes(PLAIN_VALUE);
Assert.assertNotNull(encryptedValue);
Assert.assertEquals("AVopb0Rbmz9P3XAuWmp/mA==", encryptedValue);
- String decryptedValue = CryptoUtil.decryptAes(encryptedValue);
+ String decryptedValue = cryptoUtil.decryptAes(encryptedValue);
Assert.assertNotNull(decryptedValue);
Assert.assertEquals(PLAIN_VALUE, decryptedValue);
}
@Test
public void testAesCryptDecryptAlternativeKey() throws AesEncryptionException, AesDecryptionException {
- String encryptedValue = CryptoUtil.encryptAes(PLAIN_VALUE, ALTERNATIVE_KEY);
+ String encryptedValue = cryptoUtil.encryptAes(PLAIN_VALUE, ALTERNATIVE_KEY);
Assert.assertNotNull(encryptedValue);
Assert.assertEquals("kYwVe4immFI/SuaSupaMxw==", encryptedValue);
- String decryptedValue = CryptoUtil.decryptAes(encryptedValue, ALTERNATIVE_KEY);
+ String decryptedValue = cryptoUtil.decryptAes(encryptedValue, ALTERNATIVE_KEY);
Assert.assertNotNull(decryptedValue);
Assert.assertEquals(PLAIN_VALUE, decryptedValue);
}
@Test
public void testAesCryptDecryptDifferentKeys() throws AesEncryptionException, AesDecryptionException {
- String encryptedValue1 = CryptoUtil.encryptAes(PLAIN_VALUE);
- String encryptedValue2 = CryptoUtil.encryptAes(PLAIN_VALUE, ALTERNATIVE_KEY);
+ String encryptedValue1 = cryptoUtil.encryptAes(PLAIN_VALUE);
+ String encryptedValue2 = cryptoUtil.encryptAes(PLAIN_VALUE, ALTERNATIVE_KEY);
Assert.assertNotNull(encryptedValue1);
Assert.assertNotNull(encryptedValue2);
Assert.assertNotEquals(encryptedValue1, encryptedValue2);
- String decryptedValue1 = CryptoUtil.decryptAes(encryptedValue1);
- String decryptedValue2 = CryptoUtil.decryptAes(encryptedValue2, ALTERNATIVE_KEY);
+ String decryptedValue1 = cryptoUtil.decryptAes(encryptedValue1);
+ String decryptedValue2 = cryptoUtil.decryptAes(encryptedValue2, ALTERNATIVE_KEY);
Assert.assertNotNull(decryptedValue1);
Assert.assertNotNull(decryptedValue2);
@@ -87,33 +89,33 @@ public void testAesCryptDecryptDifferentKeys() throws AesEncryptionException, Ae
@Test(expected = InvalidSecretKeyRuntimeException.class)
public void testAesEncryptInvalidAlternativeKey() throws AesEncryptionException {
- CryptoUtil.encryptAes(PLAIN_VALUE, "notAValidKey");
+ cryptoUtil.encryptAes(PLAIN_VALUE, "notAValidKey");
}
@Test(expected = InvalidSecretKeyRuntimeException.class)
public void testAesDecryptInvalidAlternativeKey() throws AesDecryptionException {
- CryptoUtil.decryptAes(PLAIN_VALUE, "notAValidValue");
+ cryptoUtil.decryptAes(PLAIN_VALUE, "notAValidValue");
}
@Test(expected = AesDecryptionException.class)
public void testAesDecryptInvalidRandomValue() throws AesDecryptionException {
- CryptoUtil.decryptAes("notAValidValue");
+ cryptoUtil.decryptAes("notAValidValue");
}
@Test(expected = AesDecryptionException.class)
public void testAesDecryptInvalidEncryptedValue() throws AesDecryptionException {
- CryptoUtil.decryptAes("kYwVe4immFI/SuaSupaMxw==");
+ cryptoUtil.decryptAes("kYwVe4immFI/SuaSupaMxw==");
}
// Base64
@Test
public void testBase64EncodeDecode() {
- String encodedValue = CryptoUtil.encodeBase64(PLAIN_VALUE);
+ String encodedValue = cryptoUtil.encodeBase64(PLAIN_VALUE);
Assert.assertNotNull(encodedValue);
Assert.assertEquals("YVBsYWluVmFsdWU=", encodedValue);
- String decodedValue = CryptoUtil.decodeBase64(encodedValue);
+ String decodedValue = cryptoUtil.decodeBase64(encodedValue);
Assert.assertNotNull(decodedValue);
Assert.assertEquals(PLAIN_VALUE, decodedValue);
}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/metric/MetricsServiceImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/metric/MetricsServiceImplTest.java
index 343585e004b..b7d1b5bb638 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/metric/MetricsServiceImplTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/metric/MetricsServiceImplTest.java
@@ -28,31 +28,26 @@ public class MetricsServiceImplTest {
@Before
public void createInstanceOfClasses() {
- metricServiceImpl = new MetricsServiceImpl();
metricRegistry = new MetricRegistry();
- }
-
- @Test
- public void getMetricRegistry() {
- Assert.assertNotNull(metricServiceImpl.getMetricRegistry());
+ metricServiceImpl = new MetricsServiceImpl(metricRegistry);
}
@Test
public void getCounterTest() {
Assert.assertNotNull("Counter object should be returned!", metricServiceImpl.getCounter("module", "component", "name1", "name2", "name3"));
- Assert.assertTrue("The keys does not exist!", metricServiceImpl.getMetricRegistry().getMetrics().containsKey("module.component.name1.name2.name3.count"));
+ Assert.assertTrue("The keys does not exist!", metricRegistry.getMetrics().containsKey("module.component.name1.name2.name3.count"));
}
@Test
public void getHistogramTest() {
Assert.assertNotNull("Histogram object should be returned!", metricServiceImpl.getHistogram("module", "component", "name1", "name2", "name3"));
- Assert.assertTrue("The keys does not exist!", metricServiceImpl.getMetricRegistry().getMetrics().containsKey("module.component.name1.name2.name3"));
+ Assert.assertTrue("The keys does not exist!", metricRegistry.getMetrics().containsKey("module.component.name1.name2.name3"));
}
@Test
public void getTimerTest() {
Assert.assertNotNull("Timer object should be returned!", metricServiceImpl.getTimer("module", "component", "name1", "name2", "name3"));
- Assert.assertTrue("TThe keys does not exist!", metricServiceImpl.getMetricRegistry().getMetrics().containsKey("module.component.name1.name2.name3"));
+ Assert.assertTrue("TThe keys does not exist!", metricRegistry.getMetrics().containsKey("module.component.name1.name2.name3"));
}
}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/EntityCacheTest.java b/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/EntityCacheTest.java
index 2c2919dcf43..98a1e6ecd29 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/EntityCacheTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/EntityCacheTest.java
@@ -12,272 +12,268 @@
*******************************************************************************/
package org.eclipse.kapua.commons.service.internal.cache;
-import org.eclipse.kapua.commons.model.query.KapuaListResultImpl;
-import org.eclipse.kapua.model.KapuaEntity;
-import org.eclipse.kapua.model.id.KapuaId;
-import org.eclipse.kapua.model.id.KapuaIdImpl;
-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 javax.cache.Cache;
-import java.io.Serializable;
-import java.math.BigInteger;
@Category(JUnitTests.class)
public class EntityCacheTest {
- @Test
- public void entityCacheTest() {
- String idCacheName = "idCacheName";
- Cache expectedIdCache = KapuaCacheManager.getCache(idCacheName);
- Cache expectedListsCache = KapuaCacheManager.getCache(idCacheName + "_list");
- //non sense! test to be removed or at least refactored!
-// Counter expectedCacheMiss = MetricServiceFactory.getInstance().getCounter("commons", "cache", "entity", "miss", "count");
-// Counter expectedCacheHit = MetricServiceFactory.getInstance().getCounter("commons", "cache", "entity", "hit", "count");
-// Counter expectedCacheRemoval = MetricServiceFactory.getInstance().getCounter("commons", "cache", "entity", "removal", "count");
- NullPointerException nullPointerException = new NullPointerException();
-
- EntityCache entityCache = new EntityCache(idCacheName);
- Assert.assertEquals(expectedIdCache, entityCache.idCache);
- Assert.assertEquals(expectedListsCache, entityCache.listsCache);
- //non sense! test to be removed or at least refactored!
-// Assert.assertEquals(expectedCacheMiss, entityCache.cacheMiss);
-// Assert.assertEquals(expectedCacheHit, entityCache.cacheHit);
-// Assert.assertEquals(expectedCacheRemoval, entityCache.cacheRemoval);
-
- try {
- EntityCache invalidEntityCache = new EntityCache(null);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
- }
- }
-
- @Test
- public void getTest() {
- String idCacheName = "idCacheName";
- EntityCache entityCache = new EntityCache(idCacheName);
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
-
- //COMMENT: Entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in EntityCache.java:
- // else {
- // cacheHit.inc();
- // }
- //and this method always returns null
- Assert.assertNull("Null expected", entityCache.get(scopeId, kapuaId));
- Assert.assertNull("Null expected", entityCache.get(null, kapuaId));
- Assert.assertNull("Null expected", entityCache.get(scopeId, null));
- Assert.assertNull("Null expected", entityCache.get(null, null));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void getListTest() {
- String idCacheName = "idCacheName";
- EntityCache entityCache = new EntityCache(idCacheName);
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId scopeId1 = new KapuaIdImpl(BigInteger.TEN);
- Serializable key = new ComposedKey(scopeId1, null);
- Serializable id = new ComposedKey(scopeId1, key);
-
- //COMMENT: This method always returns null, because entity is always null (see Cache.get() method)
- Assert.assertNull("Null expected", entityCache.getList(scopeId, id));
- Assert.assertNull("Null expected", entityCache.getList(null, id));
- Assert.assertNull("Null expected", entityCache.getList(null, null));
- Assert.assertNull("Null expected", entityCache.getList(scopeId, null));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void putTest() {
- EntityCache entityCache1 = new EntityCache("IdCacheName");
- EntityCache entityCache2 = new EntityCache("Id Cache Name");
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
- KapuaEntity kapuaEntity = entityCache2.get(scopeId, kapuaId);
-
- //COMMENT: kapuaEntity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in EntityCache.java:
- // if (entity != null) {
- // idCache.put(entity.getId(), entity);
- // }
-
- entityCache1.put(kapuaEntity);
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void putListTest() {
- String idCacheName = "IdCacheName";
- EntityCache entityCache = new EntityCache(idCacheName);
- KapuaId[] scopeIds = {null, new KapuaIdImpl(BigInteger.ONE)};
- KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
- Serializable key = new ComposedKey(scopeId1, null);
- Serializable[] ids = {null, new ComposedKey(scopeId1, key)};
- KapuaListResult list = new KapuaListResultImpl<>();
-
- for (KapuaId scopeId : scopeIds) {
- for (Serializable id : ids) {
- entityCache.putList(scopeId, id, list);
- entityCache.putList(scopeId, id, null);
- }
- }
-
- //COMMENT: this method calls Cache.put(Object key, Object value) method,
- // which has empty body.
- //Once the put(Object key, Object value) method will be changed,
- // we will be able to test assertions.
- }
-
- @Test
- public void removeWithKapuaEntityTest() {
- EntityCache entityCache = new EntityCache("IdCacheName");
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- EntityCache entityCache2 = new EntityCache("Id Cache Name");
- KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId1 = new KapuaIdImpl(BigInteger.TEN);
- KapuaEntity kapuaEntity = entityCache2.get(scopeId1, kapuaId1);
- NullPointerException nullPointerException = new NullPointerException();
-
- //COMMENT: kapuaEntity is always null (see Cache.get() method)
- // Due to that reason entity.getId() always gives NullPointerException in EntityCache.java
-
- try {
- entityCache.remove(scopeId, kapuaEntity);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
- }
-
- try {
- entityCache.remove(null, kapuaEntity);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
- }
- }
-
- @Test
- public void removeTest() {
- EntityCache entityCache = new EntityCache("IdCacheName");
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
- KapuaId nullKapuaId = null;
-
- //COMMENT: Entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in EntityCache.java:
- //if (entity != null) {
- //idCache.remove(kapuaId);
- // cacheRemoval.inc();
- //return entity;
- //}
- // and this method always returns null
- Assert.assertNull("Null expected", entityCache.remove(scopeId, kapuaId));
- Assert.assertNull("Null expected", entityCache.remove(null, kapuaId));
- Assert.assertNull("Null expected", entityCache.remove(scopeId, nullKapuaId));
- Assert.assertNull("Null expected", entityCache.remove(null, nullKapuaId));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void removeListTest() {
- EntityCache entityCache = new EntityCache("IdCacheName");
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
- Serializable key = new ComposedKey(scopeId1, null);
- Serializable id = new ComposedKey(scopeId1, key);
-
- //COMMENT: Entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in EntityCache.java:
- //if (entity != null) {
- //listsCache.remove(new ComposedKey(scopeId, id));
- //return entity;
- //}
- // and this method always returns null
- Assert.assertNull("Null expected", entityCache.removeList(scopeId, id));
- Assert.assertNull("Null expected", entityCache.removeList(null, id));
- Assert.assertNull("Null expected", entityCache.removeList(scopeId, null));
- Assert.assertNull("Null expected", entityCache.removeList(null, null));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void checkResultTest() {
- EntityCache entityCache1 = new EntityCache("idCacheName");
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- EntityCache entityCache2 = new EntityCache("idCacheName2");
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
- KapuaEntity kapuaEntity = entityCache2.get(scopeId, kapuaId);
- KapuaEntity kapuaNullEntity = null;
-
- //COMMENT: Entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in EntityCache.java:
- //if (entity != null) {
- // if (scopeId == null) {
- // return entity;
- // } else if (entity.getScopeId() == null) {
- // return entity;
- // } else if (entity.getScopeId().equals(scopeId)) {
- // return entity;
- // } else {
- // return null;
- // }
- //and this method always returns null
- Assert.assertNull("Null expected", entityCache1.checkResult(scopeId, kapuaEntity));
- Assert.assertNull("Null expected", entityCache1.checkResult(null, kapuaEntity));
- Assert.assertNull("Null expected", entityCache1.checkResult(scopeId, kapuaNullEntity));
- Assert.assertNull("Null expected", entityCache1.checkResult(null, kapuaNullEntity));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void checkResultListTest() {
- KapuaListResult kapuaNullListResult = null;
- EntityCache entityCache = new EntityCache("idCacheName");
- KapuaListResult kapuaListResult = new KapuaListResultImpl<>();
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- EntityCache entityCache2 = new EntityCache("idCacheName2");
- KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
- KapuaEntity kapuaEntity = entityCache2.get(scopeId1, kapuaId);
- NullPointerException nullPointerException = new NullPointerException();
-
- //COMMENT: entity.getFirstItem().getScopeId() returns nullPointerException, because entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in EntityCache.java:
- // else if (entity.getFirstItem().getScopeId() == null) {
- //return entity;
- //} else if (entity.getFirstItem().getScopeId().equals(scopeId)) {
- //return entity;
- //} else {
- //return null;
- //}
-
- Assert.assertNull("Null expected", entityCache.checkResult(scopeId, kapuaNullListResult));
- Assert.assertEquals(kapuaListResult, entityCache.checkResult(scopeId, kapuaListResult));
- kapuaListResult.addItem(kapuaEntity);
- Assert.assertEquals(kapuaListResult, entityCache.checkResult(null, kapuaListResult));
-
- try {
- Assert.assertEquals(kapuaListResult, entityCache.checkResult(scopeId, kapuaListResult));
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
- }
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
+ //TODO: FIXME: PRIORITY: rewrite
+// @Before
+// public void setFakeLocator() {
+// System.setProperty(org.eclipse.kapua.locator.KapuaLocator.LOCATOR_CLASS_NAME_SYSTEM_PROPERTY, MockitoLocator.class.getName());
+// }
+//
+// @Test
+// public void entityCacheTest() {
+// String idCacheName = "idCacheName";
+// Cache expectedIdCache = StaticKapuaCacheManager.getCache(idCacheName);
+// Cache expectedListsCache = StaticKapuaCacheManager.getCache(idCacheName + "_list");
+// //non sense! test to be removed or at least refactored!
+//// Counter expectedCacheMiss = MetricServiceFactory.getInstance().getCounter("commons", "cache", "entity", "miss", "count");
+//// Counter expectedCacheHit = MetricServiceFactory.getInstance().getCounter("commons", "cache", "entity", "hit", "count");
+//// Counter expectedCacheRemoval = MetricServiceFactory.getInstance().getCounter("commons", "cache", "entity", "removal", "count");
+// NullPointerException nullPointerException = new NullPointerException();
+//
+// EntityCache entityCache = new EntityCache(idCacheName);
+// Assert.assertEquals(expectedIdCache, entityCache.idCache);
+// Assert.assertEquals(expectedListsCache, entityCache.listsCache);
+// //non sense! test to be removed or at least refactored!
+//// Assert.assertEquals(expectedCacheMiss, entityCache.cacheMiss);
+//// Assert.assertEquals(expectedCacheHit, entityCache.cacheHit);
+//// Assert.assertEquals(expectedCacheRemoval, entityCache.cacheRemoval);
+//
+// try {
+// EntityCache invalidEntityCache = new EntityCache(null);
+// } catch (Exception e) {
+// Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
+// }
+// }
+//
+// @Test
+// public void getTest() {
+// String idCacheName = "idCacheName";
+// EntityCache entityCache = new EntityCache(idCacheName);
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
+//
+// //COMMENT: Entity is always null (see Cache.get() method)
+// // Due to that reason the following part of code could not be tested in EntityCache.java:
+// // else {
+// // cacheHit.inc();
+// // }
+// //and this method always returns null
+// Assert.assertNull("Null expected", entityCache.get(scopeId, kapuaId));
+// Assert.assertNull("Null expected", entityCache.get(null, kapuaId));
+// Assert.assertNull("Null expected", entityCache.get(scopeId, null));
+// Assert.assertNull("Null expected", entityCache.get(null, null));
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
+//
+// @Test
+// public void getListTest() {
+// String idCacheName = "idCacheName";
+// EntityCache entityCache = new EntityCache(idCacheName);
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId scopeId1 = new KapuaIdImpl(BigInteger.TEN);
+// Serializable key = new ComposedKey(scopeId1, null);
+// Serializable id = new ComposedKey(scopeId1, key);
+//
+// //COMMENT: This method always returns null, because entity is always null (see Cache.get() method)
+// Assert.assertNull("Null expected", entityCache.getList(scopeId, id));
+// Assert.assertNull("Null expected", entityCache.getList(null, id));
+// Assert.assertNull("Null expected", entityCache.getList(null, null));
+// Assert.assertNull("Null expected", entityCache.getList(scopeId, null));
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
+//
+// @Test
+// public void putTest() {
+// EntityCache entityCache1 = new EntityCache("IdCacheName");
+// EntityCache entityCache2 = new EntityCache("Id Cache Name");
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
+// KapuaEntity kapuaEntity = entityCache2.get(scopeId, kapuaId);
+//
+// //COMMENT: kapuaEntity is always null (see Cache.get() method)
+// // Due to that reason the following part of code could not be tested in EntityCache.java:
+// // if (entity != null) {
+// // idCache.put(entity.getId(), entity);
+// // }
+//
+// entityCache1.put(kapuaEntity);
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
+//
+// @Test
+// public void putListTest() {
+// String idCacheName = "IdCacheName";
+// EntityCache entityCache = new EntityCache(idCacheName);
+// KapuaId[] scopeIds = {null, new KapuaIdImpl(BigInteger.ONE)};
+// KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
+// Serializable key = new ComposedKey(scopeId1, null);
+// Serializable[] ids = {null, new ComposedKey(scopeId1, key)};
+// KapuaListResult list = new KapuaListResultImpl<>();
+//
+// for (KapuaId scopeId : scopeIds) {
+// for (Serializable id : ids) {
+// entityCache.putList(scopeId, id, list);
+// entityCache.putList(scopeId, id, null);
+// }
+// }
+//
+// //COMMENT: this method calls Cache.put(Object key, Object value) method,
+// // which has empty body.
+// //Once the put(Object key, Object value) method will be changed,
+// // we will be able to test assertions.
+// }
+//
+// @Test
+// public void removeWithKapuaEntityTest() {
+// EntityCache entityCache = new EntityCache("IdCacheName");
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// EntityCache entityCache2 = new EntityCache("Id Cache Name");
+// KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId kapuaId1 = new KapuaIdImpl(BigInteger.TEN);
+// KapuaEntity kapuaEntity = entityCache2.get(scopeId1, kapuaId1);
+// NullPointerException nullPointerException = new NullPointerException();
+//
+// //COMMENT: kapuaEntity is always null (see Cache.get() method)
+// // Due to that reason entity.getId() always gives NullPointerException in EntityCache.java
+//
+// try {
+// entityCache.remove(scopeId, kapuaEntity);
+// } catch (Exception e) {
+// Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
+// }
+//
+// try {
+// entityCache.remove(null, kapuaEntity);
+// } catch (Exception e) {
+// Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
+// }
+// }
+//
+// @Test
+// public void removeTest() {
+// EntityCache entityCache = new EntityCache("IdCacheName");
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
+// KapuaId nullKapuaId = null;
+//
+// //COMMENT: Entity is always null (see Cache.get() method)
+// // Due to that reason the following part of code could not be tested in EntityCache.java:
+// //if (entity != null) {
+// //idCache.remove(kapuaId);
+// // cacheRemoval.inc();
+// //return entity;
+// //}
+// // and this method always returns null
+// Assert.assertNull("Null expected", entityCache.remove(scopeId, kapuaId));
+// Assert.assertNull("Null expected", entityCache.remove(null, kapuaId));
+// Assert.assertNull("Null expected", entityCache.remove(scopeId, nullKapuaId));
+// Assert.assertNull("Null expected", entityCache.remove(null, nullKapuaId));
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
+//
+// @Test
+// public void removeListTest() {
+// EntityCache entityCache = new EntityCache("IdCacheName");
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
+// Serializable key = new ComposedKey(scopeId1, null);
+// Serializable id = new ComposedKey(scopeId1, key);
+//
+// //COMMENT: Entity is always null (see Cache.get() method)
+// // Due to that reason the following part of code could not be tested in EntityCache.java:
+// //if (entity != null) {
+// //listsCache.remove(new ComposedKey(scopeId, id));
+// //return entity;
+// //}
+// // and this method always returns null
+// Assert.assertNull("Null expected", entityCache.removeList(scopeId, id));
+// Assert.assertNull("Null expected", entityCache.removeList(null, id));
+// Assert.assertNull("Null expected", entityCache.removeList(scopeId, null));
+// Assert.assertNull("Null expected", entityCache.removeList(null, null));
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
+//
+// @Test
+// public void checkResultTest() {
+// EntityCache entityCache1 = new EntityCache("idCacheName");
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// EntityCache entityCache2 = new EntityCache("idCacheName2");
+// KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
+// KapuaEntity kapuaEntity = entityCache2.get(scopeId, kapuaId);
+// KapuaEntity kapuaNullEntity = null;
+//
+// //COMMENT: Entity is always null (see Cache.get() method)
+// // Due to that reason the following part of code could not be tested in EntityCache.java:
+// //if (entity != null) {
+// // if (scopeId == null) {
+// // return entity;
+// // } else if (entity.getScopeId() == null) {
+// // return entity;
+// // } else if (entity.getScopeId().equals(scopeId)) {
+// // return entity;
+// // } else {
+// // return null;
+// // }
+// //and this method always returns null
+// Assert.assertNull("Null expected", entityCache1.checkResult(scopeId, kapuaEntity));
+// Assert.assertNull("Null expected", entityCache1.checkResult(null, kapuaEntity));
+// Assert.assertNull("Null expected", entityCache1.checkResult(scopeId, kapuaNullEntity));
+// Assert.assertNull("Null expected", entityCache1.checkResult(null, kapuaNullEntity));
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
+//
+// @Test
+// public void checkResultListTest() {
+// KapuaListResult kapuaNullListResult = null;
+// EntityCache entityCache = new EntityCache("idCacheName");
+// KapuaListResult kapuaListResult = new KapuaListResultImpl<>();
+// KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
+// EntityCache entityCache2 = new EntityCache("idCacheName2");
+// KapuaId scopeId1 = new KapuaIdImpl(BigInteger.ONE);
+// KapuaId kapuaId = new KapuaIdImpl(BigInteger.TEN);
+// KapuaEntity kapuaEntity = entityCache2.get(scopeId1, kapuaId);
+// NullPointerException nullPointerException = new NullPointerException();
+//
+// //COMMENT: entity.getFirstItem().getScopeId() returns nullPointerException, because entity is always null (see Cache.get() method)
+// // Due to that reason the following part of code could not be tested in EntityCache.java:
+// // else if (entity.getFirstItem().getScopeId() == null) {
+// //return entity;
+// //} else if (entity.getFirstItem().getScopeId().equals(scopeId)) {
+// //return entity;
+// //} else {
+// //return null;
+// //}
+//
+// Assert.assertNull("Null expected", entityCache.checkResult(scopeId, kapuaNullListResult));
+// Assert.assertEquals(kapuaListResult, entityCache.checkResult(scopeId, kapuaListResult));
+// kapuaListResult.addItem(kapuaEntity);
+// Assert.assertEquals(kapuaListResult, entityCache.checkResult(null, kapuaListResult));
+//
+// try {
+// Assert.assertEquals(kapuaListResult, entityCache.checkResult(scopeId, kapuaListResult));
+// } catch (Exception e) {
+// Assert.assertEquals("NullPointerException expected", nullPointerException.toString(), e.toString());
+// }
+//
+// // COMMENT: Once the get() method will be changed,
+// // we will be able to test other results also.
+// }
}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManagerTest.java b/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManagerTest.java
deleted file mode 100644
index d86e80c992e..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/KapuaCacheManagerTest.java
+++ /dev/null
@@ -1,54 +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.commons.service.internal.cache;
-
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.cache.Cache;
-import java.lang.reflect.Constructor;
-
-
-@Category(JUnitTests.class)
-public class KapuaCacheManagerTest {
-
- @Test
- public void kapuaCacheManagerTest() throws Exception {
- Constructor kapuaCacheManager = KapuaCacheManager.class.getDeclaredConstructor();
- kapuaCacheManager.setAccessible(true);
- kapuaCacheManager.newInstance();
- }
-
- @Test
- public void getCacheTest() {
- String cacheName = "cacheName";
- NullPointerException nullPointerException = new NullPointerException();
-
- Assert.assertNotNull("Null not expected.", KapuaCacheManager.getCache(cacheName));
- Assert.assertThat("Cache object expected.", KapuaCacheManager.getCache(cacheName), IsInstanceOf.instanceOf(Cache.class));
-
- try {
- KapuaCacheManager.getCache(null);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected.", nullPointerException.toString(), e.toString());
- }
- }
-
- @Test
- public void invalidateAllTest() {
- KapuaCacheManager.invalidateAll();
- }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/MockitoLocator.java b/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/MockitoLocator.java
new file mode 100644
index 00000000000..d516949f3fe
--- /dev/null
+++ b/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/MockitoLocator.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * 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.commons.service.internal.cache;
+
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.ExponentiallyDecayingReservoir;
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Timer;
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.commons.metric.CommonsMetric;
+import org.eclipse.kapua.commons.metric.MetricsService;
+import org.eclipse.kapua.locator.KapuaLocator;
+import org.eclipse.kapua.model.KapuaObjectFactory;
+import org.eclipse.kapua.service.KapuaService;
+import org.mockito.Mockito;
+
+import java.util.Collections;
+import java.util.List;
+
+public class MockitoLocator extends KapuaLocator {
+
+ @Override
+ public S getService(Class serviceClass) {
+ return Mockito.mock(serviceClass);
+ }
+
+ @Override
+ public F getFactory(Class factoryClass) {
+ return Mockito.mock(factoryClass);
+ }
+
+ @Override
+ public List getServices() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public T getComponent(Class componentClass) {
+ final MetricsService metricsService = new MetricsService() {
+ @Override
+ public Counter getCounter(String module, String component, String... names) {
+ return new Counter();
+ }
+
+ @Override
+ public Histogram getHistogram(String module, String component, String... names) {
+ return new Histogram(new ExponentiallyDecayingReservoir());
+ }
+
+ @Override
+ public Timer getTimer(String module, String component, String... names) {
+ return new Timer();
+ }
+
+ @Override
+ public void registerGauge(Gauge gauge, String module, String component, String... names) throws KapuaException {
+
+ }
+ };
+ if (MetricsService.class.equals(componentClass)) {
+ return (T) metricsService;
+ }
+ if (CommonsMetric.class.equals(componentClass)) {
+ try {
+ return (T) new CommonsMetric(metricsService, "tests");
+ } catch (KapuaException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return Mockito.mock(componentClass);
+ }
+}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCacheTest.java b/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCacheTest.java
deleted file mode 100644
index e4f3724969f..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/service/internal/cache/NamedEntityCacheTest.java
+++ /dev/null
@@ -1,123 +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.commons.service.internal.cache;
-
-import org.eclipse.kapua.model.KapuaEntity;
-import org.eclipse.kapua.model.id.KapuaId;
-import org.eclipse.kapua.model.id.KapuaIdImpl;
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.cache.Cache;
-import java.io.Serializable;
-import java.math.BigInteger;
-
-
-@Category(JUnitTests.class)
-public class NamedEntityCacheTest {
-
- @Test
- public void namedEntityCacheTest() {
- String idCacheName = "idCacheName";
- String nameCacheName = "nameCacheName";
- NullPointerException nullPointerException = new NullPointerException();
-
- NamedEntityCache namedEntityCache = new NamedEntityCache(idCacheName, nameCacheName);
- Cache expectedNameCache = KapuaCacheManager.getCache(nameCacheName);
-
- Assert.assertEquals("Expected and actual values should be the same.", expectedNameCache, namedEntityCache.nameCache);
-
- try {
- NamedEntityCache invalidNamedEntityCache = new NamedEntityCache(idCacheName, null);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected.", nullPointerException.toString(), e.toString());
- }
- try {
- NamedEntityCache invalidNamedEntityCache = new NamedEntityCache(null, nameCacheName);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected.", nullPointerException.toString(), e.toString());
- }
- try {
- NamedEntityCache invalidNamedEntityCache = new NamedEntityCache(null, null);
- } catch (Exception e) {
- Assert.assertEquals("NullPointerException expected.", nullPointerException.toString(), e.toString());
- }
- }
-
- @Test
- public void getTest() {
- String idCacheName = "idCacheName";
- String nameCacheName = "nameCacheName";
- NamedEntityCache namedEntityCache = new NamedEntityCache(idCacheName, nameCacheName);
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- String name = "name";
- String nullName = null;
-
- //COMMENT: entityId is always null (see Cache.get() method)
- //Due to that reason this method always returns null
- Assert.assertNull("Null expected.", namedEntityCache.get(scopeId, name));
- Assert.assertNull("Null expected.", namedEntityCache.get(null, name));
- Assert.assertNull("Null expected.", namedEntityCache.get(scopeId, nullName));
- Assert.assertNull("Null expected.", namedEntityCache.get(null, nullName));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void putTest() {
- NamedEntityCache namedEntityCache = new NamedEntityCache("idCacheName", "nameCacheName");
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.ONE);
- KapuaEntity kapuaEntity = namedEntityCache.get(scopeId, kapuaId);
-
- //COMMENT: Entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in NamedEntityCache.java:
- //if (entity != null) {
- // idCache.put(entity.getId(), entity);
- // nameCache.put(((KapuaNamedEntity) entity).getName(), entity.getId());
- // }
- namedEntityCache.put(kapuaEntity);
- namedEntityCache.put(null);
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-
- @Test
- public void removeTest() {
- String idCacheName = "idCacheName";
- String nameCacheName = "nameCacheName";
- NamedEntityCache namedEntityCache = new NamedEntityCache(idCacheName, nameCacheName);
- KapuaId scopeId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId kapuaId = new KapuaIdImpl(BigInteger.ONE);
- KapuaId nullScopeId = null;
- KapuaId nullKapuaId = null;
-
- //COMMENT: Entity is always null (see Cache.get() method)
- // Due to that reason the following part of code could not be tested in NamedEntityCache.java:
- //if (kapuaEntity != null) {
- // nameCache.remove(((KapuaNamedEntity) kapuaEntity).getName());
- // }
- //and this method always returns null
- Assert.assertNull("Null expected.", namedEntityCache.remove(scopeId, kapuaId));
- Assert.assertNull("Null expected.", namedEntityCache.remove(nullScopeId, kapuaId));
- Assert.assertNull("Null expected.", namedEntityCache.remove(scopeId, nullKapuaId));
- Assert.assertNull("Null expected.", namedEntityCache.remove(nullScopeId, nullKapuaId));
-
- // COMMENT: Once the get() method will be changed,
- // we will be able to test other results also.
- }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/util/CryptoUtilTest.java b/commons/src/test/java/org/eclipse/kapua/commons/util/CryptoUtilImplTest.java
similarity index 87%
rename from commons/src/test/java/org/eclipse/kapua/commons/util/CryptoUtilTest.java
rename to commons/src/test/java/org/eclipse/kapua/commons/util/CryptoUtilImplTest.java
index e616567d08b..61db3403633 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/util/CryptoUtilTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/util/CryptoUtilImplTest.java
@@ -14,26 +14,21 @@
package org.eclipse.kapua.commons.util;
import org.eclipse.kapua.commons.crypto.CryptoUtil;
+import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
+import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
import org.eclipse.kapua.qa.markers.junit.JUnitTests;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.lang.reflect.Constructor;
import java.util.Random;
@Category(JUnitTests.class)
-public class CryptoUtilTest {
+public class CryptoUtilImplTest {
private static final Random RANDOM = RandomUtils.getInstance();
-
- @Test
- public void testConstructor() throws Exception {
- Constructor crypto = CryptoUtil.class.getDeclaredConstructor();
- crypto.setAccessible(true);
- crypto.newInstance();
- }
+ private final CryptoUtil cryptoUtil = new CryptoUtilImpl(new CryptoSettings());
@Test
public void testSha1Hash() throws Exception {
@@ -50,7 +45,7 @@ public void testSha1Hash() throws Exception {
// Negative tests
for (int i = 0; i < sizeOfFalseStrings; i++) {
try {
- CryptoUtil.sha1Hash(falseStrings[i]);
+ cryptoUtil.sha1Hash(falseStrings[i]);
Assert.fail("Exception expected for: " + falseStrings[i]);
} catch (Exception ex) {
// Expected
@@ -59,7 +54,7 @@ public void testSha1Hash() throws Exception {
// Positive tests
for (int i = 0; i < sizeOfPermittedStrings; i++) {
try {
- CryptoUtil.sha1Hash(permittedStrings[i]);
+ cryptoUtil.sha1Hash(permittedStrings[i]);
} catch (Exception ex) {
Assert.fail("No exception expected for 'test string'");
}
@@ -81,7 +76,7 @@ public void testEncodeBase64() {
// Negative tests
for (int i = 0; i < sizeOfFalseStrings; i++) {
try {
- CryptoUtil.encodeBase64(falseStrings[i]);
+ cryptoUtil.encodeBase64(falseStrings[i]);
Assert.fail("Exception expected for: " + falseStrings[i]);
} catch (Exception ex) {
// Expected
@@ -91,7 +86,7 @@ public void testEncodeBase64() {
// Positive tests
for (int i = 0; i < sizeOfPermittedStrings; i++) {
try {
- CryptoUtil.encodeBase64(permittedStrings[i]);
+ cryptoUtil.encodeBase64(permittedStrings[i]);
} catch (Exception ex) {
Assert.fail("No exception expected for 'test string'");
}
@@ -113,7 +108,7 @@ public void testDecodeBase64() {
// Negative tests
for (int i = 0; i < sizeOfFalseStrings; i++) {
try {
- CryptoUtil.decodeBase64(falseStrings[i]);
+ cryptoUtil.decodeBase64(falseStrings[i]);
Assert.fail("Exception expected for: " + falseStrings[i]);
} catch (Exception ex) {
// Expected
@@ -123,7 +118,7 @@ public void testDecodeBase64() {
// Positive tests
for (int i = 0; i < sizeOfPermittedStrings; i++) {
try {
- CryptoUtil.decodeBase64(permittedStrings[i]);
+ cryptoUtil.decodeBase64(permittedStrings[i]);
} catch (Exception ex) {
Assert.fail("No exception expected for 'test string'");
}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/util/KapuaFileUtilsTest.java b/commons/src/test/java/org/eclipse/kapua/commons/util/KapuaFileUtilsTest.java
index 9a968cb1c91..8c645900164 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/util/KapuaFileUtilsTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/util/KapuaFileUtilsTest.java
@@ -93,7 +93,8 @@ public void getAsUrlInvalidTest() {
public void getAsFileTest() {
String[] stringUrls = new String[]{
"https://opensource.apple.com/source/cups/cups-218/cups/data/iso-8859-1.txt",
- "http://txt2html.sourceforge.net/sample.txt",
+ //As per 2023-09-07, this file is no longer available:
+// "http://txt2html.sourceforge.net/sample.txt",
"https://www.lipsum.com/"};
for (String stringURL : stringUrls) {
try {
diff --git a/commons/src/test/resources/locator.xml b/commons/src/test/resources/locator.xml
new file mode 100644
index 00000000000..79688e94404
--- /dev/null
+++ b/commons/src/test/resources/locator.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+ org.eclipse.kapua
+
+
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java
index e940c7f8463..d6caaf05441 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java
@@ -36,8 +36,8 @@
public class ChangePasswordDialog extends SimpleDialog {
- GwtCredentialServiceAsync credentialService = GWT.create(GwtCredentialService.class);
- private static final ConsoleMessages CONSOLE_MSGS = GWT.create(ConsoleMessages.class);
+ private final GwtCredentialServiceAsync credentialService = GWT.create(GwtCredentialService.class);
+ private final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class);
private TextField oldPassword;
private TextField newPassword;
@@ -130,17 +130,17 @@ public void onFailure(Throwable caught) {
GwtKapuaException gwtCaught = (GwtKapuaException) caught;
if (gwtCaught.getCode().equals(GwtKapuaErrorCode.INVALID_USERNAME_PASSWORD)) {
if (credentialFormPanel.findComponent(code) != null) {
- ConsoleInfo.display(CONSOLE_MSGS.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPasswordOrMfaCode()));
+ ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPasswordOrMfaCode()));
} else {
- ConsoleInfo.display(CONSOLE_MSGS.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPassword()));
+ ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPassword()));
oldPassword.markInvalid(MSGS.changePasswordErrorWrongOldPassword());
}
} else if (gwtCaught.getCode().equals(GwtKapuaErrorCode.UNAUTHENTICATED)) {
- ConsoleInfo.display(CONSOLE_MSGS.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage()));
+ ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage()));
hide();
TokenCleaner.cleanToken();
} else {
- ConsoleInfo.display(CONSOLE_MSGS.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage()));
+ ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage()));
}
}
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java
index 184a85477a9..11f42bd7f1a 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java
@@ -74,11 +74,11 @@ public class KapuaCloudConsole implements EntryPoint {
private static final Logger LOG = Logger.getLogger(KapuaCloudConsole.class.getName());
- private static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
- private static final ConsoleCoreMessages CORE_MSGS = GWT.create(ConsoleCoreMessages.class);
+ private final ConsoleMessages msgs = GWT.create(ConsoleMessages.class);
+ private final ConsoleCoreMessages coreMessages = GWT.create(ConsoleCoreMessages.class);
- private static final GwtAuthorizationServiceAsync GWT_AUTHORIZATION_SERVICE = GWT.create(GwtAuthorizationService.class);
- private static final GwtSettingsServiceAsync GWT_SETTINGS_SERVICE = GWT.create(GwtSettingsService.class);
+ private final GwtAuthorizationServiceAsync gwtAuthorizationServiceAsync = GWT.create(GwtAuthorizationService.class);
+ private final GwtSettingsServiceAsync gwtSettingsServiceAsync = GWT.create(GwtSettingsService.class);
// OpenID Connect single sign-on parameters
public static final String OPENID_ACCESS_TOKEN_PARAM = "access_token";
@@ -133,7 +133,7 @@ public void execute() {
* @since 1.0.0
*/
public void onModuleLoad2() {
- GWT_SETTINGS_SERVICE.getProductInformation(new AsyncCallback() {
+ gwtSettingsServiceAsync.getProductInformation(new AsyncCallback() {
@Override
public void onFailure(Throwable caught) {
@@ -144,7 +144,7 @@ public void onFailure(Throwable caught) {
public void onSuccess(GwtProductInformation result) {
productInformation = result;
// Check if a session has already been established on the server-side
- GWT_AUTHORIZATION_SERVICE.getCurrentSession(new AsyncCallback() {
+ gwtAuthorizationServiceAsync.getCurrentSession(new AsyncCallback() {
@Override
public void onFailure(Throwable t) {
@@ -360,7 +360,7 @@ private void renderLoginDialog() {
// Check if coming from failed OpenID Connect login (the user exists but she does not have the authorizations)
if (error != null && error.equals("access_denied")) {
LOG.info("Access denied, OpenID Connect login failed");
- ConsoleInfo.display(CORE_MSGS.loginSsoLoginError(), CORE_MSGS.ssoClientAuthenticationFailed());
+ ConsoleInfo.display(coreMessages.loginSsoLoginError(), coreMessages.ssoClientAuthenticationFailed());
}
showLoginDialog(viewport);
}
@@ -380,7 +380,7 @@ public void handleEvent(ComponentEvent be) {
}
});
- loginDialog.setHeading(CORE_MSGS.loginTitle(productInformation.getProductName()));
+ loginDialog.setHeading(coreMessages.loginTitle(productInformation.getProductName()));
if (!UserAgentUtils.isIE()) {
Window.addResizeHandler(new ResizeHandler() {
@@ -399,14 +399,14 @@ private void performOpenIDLogin(final Viewport viewport, String accessToken, Str
// show wait dialog
final Dialog ssoLoginWaitDialog = new Dialog();
- ssoLoginWaitDialog.setHeading(MSGS.ssoWaitDialog_title());
+ ssoLoginWaitDialog.setHeading(msgs.ssoWaitDialog_title());
ssoLoginWaitDialog.setButtons("");
ssoLoginWaitDialog.setClosable(false);
ssoLoginWaitDialog.setResizable(false);
ssoLoginWaitDialog.setModal(true);
ssoLoginWaitDialog.setOnEsc(false);
- Label label = new Label(MSGS.ssoWaitDialog_text());
+ Label label = new Label(msgs.ssoWaitDialog_text());
ssoLoginWaitDialog.add(label);
ssoLoginWaitDialog.show();
@@ -415,19 +415,19 @@ private void performOpenIDLogin(final Viewport viewport, String accessToken, Str
// start login process
final GwtJwtIdToken gwtIdToken = new GwtJwtIdToken(idToken);
final GwtJwtCredential credentials = new GwtJwtCredential(accessToken);
- GWT_AUTHORIZATION_SERVICE.login(credentials, gwtIdToken, new AsyncCallback() {
+ gwtAuthorizationServiceAsync.login(credentials, gwtIdToken, new AsyncCallback() {
@Override
public void onFailure(Throwable caught) {
ssoLoginWaitDialog.hide();
LOG.info("OpenID Connect login failed.");
- ConsoleInfo.display(CORE_MSGS.loginSsoLoginError(), caught.getLocalizedMessage());
+ ConsoleInfo.display(coreMessages.loginSsoLoginError(), caught.getLocalizedMessage());
// Invalidating the OpenID IdToken. We must use the OpenID logout here, since we don't have the KapuSession set yet, so we don't have the
// openIDidToken set inside. This means we cannot realy on the OpenIDLogoutListener to invalidate the OpenID session, instead we must do that
// as a 'real' user initiated logout.
- GWT_SETTINGS_SERVICE.getOpenIDLogoutUri(gwtIdToken.getIdToken(), new AsyncCallback() {
+ gwtSettingsServiceAsync.getOpenIDLogoutUri(gwtIdToken.getIdToken(), new AsyncCallback() {
@Override
public void onFailure(Throwable caught) {
@@ -523,7 +523,7 @@ private void renderMainScreen(Viewport viewport, GwtSession session) {
// or else
- ConsoleInfo.display(MSGS.error(), CORE_MSGS.loginError());
+ ConsoleInfo.display(msgs.error(), coreMessages.loginError());
showLoginDialog(viewport);
}
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java
index 284c375b374..fcd86e391b0 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java
@@ -24,7 +24,7 @@
*/
public class KapuaViewport extends Viewport {
- protected static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
+ protected final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class);
/**
* Minimum width of browser window.
@@ -42,7 +42,7 @@ public KapuaViewport() {
super();
setMonitorWindowResize(true);
- infoPopup = new InfoPopup(MSGS.browserWindowTooSmall());
+ infoPopup = new InfoPopup(consoleMessages.browserWindowTooSmall());
infoPopup.setGlassStyleName("kapua-PopupPanelGlass");
int clientHeight = Window.getClientHeight();
int clientWidth = Window.getClientWidth();
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java
index 22a0bbf2473..981d6993ec8 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java
@@ -52,8 +52,8 @@
*/
public class LoginDialog extends Dialog {
- private static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
- private static final ConsoleCoreMessages CORE_MSGS = GWT.create(ConsoleCoreMessages.class);
+ private final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class);
+ private final ConsoleCoreMessages consoleCoreMessages = GWT.create(ConsoleCoreMessages.class);
private final GwtAuthorizationServiceAsync gwtAuthorizationService = GWT.create(GwtAuthorizationService.class);
private final GwtSettingsServiceAsync gwtSettingService = GWT.create(GwtSettingsService.class);
@@ -114,7 +114,7 @@ public void handleEvent(BaseEvent be) {
};
username = new TextField();
- username.setFieldLabel(CORE_MSGS.loginUsername());
+ username.setFieldLabel(consoleCoreMessages.loginUsername());
username.addKeyListener(keyListener);
username.setAllowBlank(false);
username.addListener(Events.OnBlur, changeListener);
@@ -123,7 +123,7 @@ public void handleEvent(BaseEvent be) {
password = new TextField();
password.setPassword(true);
- password.setFieldLabel(CORE_MSGS.loginPassword());
+ password.setFieldLabel(consoleCoreMessages.loginPassword());
password.addKeyListener(keyListener);
password.setAllowBlank(false);
password.addListener(Events.OnBlur, changeListener);
@@ -134,7 +134,7 @@ public void handleEvent(BaseEvent be) {
@Override
public void onFailure(Throwable caught) {
- ConsoleInfo.display(CORE_MSGS.loginSsoEnabledError(), caught.getLocalizedMessage());
+ ConsoleInfo.display(consoleCoreMessages.loginSsoEnabledError(), caught.getLocalizedMessage());
}
@Override
@@ -190,14 +190,14 @@ protected void createButtons() {
super.createButtons();
status = new Status();
- status.setBusy(MSGS.waitMsg());
+ status.setBusy(consoleMessages.waitMsg());
status.hide();
status.setAutoWidth(true);
getButtonBar().add(status);
getButtonBar().add(new FillToolItem());
- reset = new Button(CORE_MSGS.loginReset());
+ reset = new Button(consoleCoreMessages.loginReset());
reset.disable();
reset.addSelectionListener(new SelectionListener() {
@@ -213,7 +213,7 @@ public void componentSelected(ButtonEvent ce) {
}
});
- login = new Button(CORE_MSGS.loginLogin());
+ login = new Button(consoleCoreMessages.loginLogin());
login.addSelectionListener(new SelectionListener() {
@Override
@@ -222,7 +222,7 @@ public void componentSelected(ButtonEvent ce) {
}
});
- ssoLogin = new Button(CORE_MSGS.loginSsoLogin());
+ ssoLogin = new Button(consoleCoreMessages.loginSsoLogin());
ssoLogin.addSelectionListener(new SelectionListener() {
@Override
@@ -243,7 +243,7 @@ protected void doSsoLogin() {
@Override
public void onFailure(Throwable caught) {
- ConsoleInfo.display(CORE_MSGS.loginSsoLoginError(), caught.getLocalizedMessage());
+ ConsoleInfo.display(consoleCoreMessages.loginSsoLoginError(), caught.getLocalizedMessage());
}
@Override
@@ -265,12 +265,12 @@ protected void onRender(Element parent, int pos) {
*/
protected void onSubmit() {
if (username.getValue() == null && password.getValue() == null) {
- ConsoleInfo.display(MSGS.dialogError(), MSGS.usernameAndPasswordRequired());
+ ConsoleInfo.display(consoleMessages.dialogError(), consoleMessages.usernameAndPasswordRequired());
password.markInvalid(password.getErrorMessage());
} else if (username.getValue() == null) {
- ConsoleInfo.display(MSGS.dialogError(), MSGS.usernameFieldRequired());
+ ConsoleInfo.display(consoleMessages.dialogError(), consoleMessages.usernameFieldRequired());
} else if (password.getValue() == null) {
- ConsoleInfo.display(MSGS.dialogError(), MSGS.passwordFieldRequired());
+ ConsoleInfo.display(consoleMessages.dialogError(), consoleMessages.passwordFieldRequired());
password.markInvalid(password.getErrorMessage());
} else {
@@ -309,7 +309,7 @@ public void onFailure(Throwable caught) {
mfaLoginDialog.show();
return;
} else {
- ConsoleInfo.display(CORE_MSGS.loginError(), caught.getLocalizedMessage());
+ ConsoleInfo.display(consoleCoreMessages.loginError(), caught.getLocalizedMessage());
}
CookieUtils.removeCookie(CookieUtils.KAPUA_COOKIE_TRUST + username.getValue());
} else {
@@ -337,7 +337,7 @@ public void onFailure(Throwable caught) {
@Override
public void onSuccess(Void arg0) {
- ConsoleInfo.display(MSGS.popupInfo(), MSGS.loggedOut());
+ ConsoleInfo.display(consoleMessages.popupInfo(), consoleMessages.loggedOut());
resetDialog();
show();
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java
index e55aa2a0166..0c5f625b934 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java
@@ -45,9 +45,9 @@
*/
public class MfaLoginDialog extends Dialog {
- private static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
- private static final ConsoleCredentialMessages CRED_MSGS = GWT.create(ConsoleCredentialMessages.class);
- private static final ConsoleCoreMessages CORE_MSGS = GWT.create(ConsoleCoreMessages.class);
+ private final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class);
+ private final ConsoleCredentialMessages consoleCredentialMessages = GWT.create(ConsoleCredentialMessages.class);
+ private final ConsoleCoreMessages consoleCoreMessages = GWT.create(ConsoleCoreMessages.class);
private final GwtAuthorizationServiceAsync gwtAuthorizationService = GWT.create(GwtAuthorizationService.class);
@@ -74,7 +74,7 @@ public MfaLoginDialog(LoginDialog loginDialog) {
setButtons(""); // don't show OK button
setIcon(IconHelper.createStyle("user"));
- setHeading(CRED_MSGS.mfaLoginTitle());
+ setHeading(consoleCredentialMessages.mfaLoginTitle());
setModal(true);
setBodyBorder(true);
@@ -96,29 +96,29 @@ public void componentKeyUp(ComponentEvent event) {
}
};
- Label title = new Label(MSGS.loginDialogMfaTitle());
+ Label title = new Label(consoleMessages.loginDialogMfaTitle());
title.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
add(title);
// MFA presentation text
add(new HTML(BR));
- add(new Label(MSGS.loginMfa()));
+ add(new Label(consoleMessages.loginMfa()));
add(new HTML(BR));
- add(new Label(MSGS.loginMfa1()));
+ add(new Label(consoleMessages.loginMfa1()));
add(new HTML(BR));
// MFA code
code = new TextField();
- code.setFieldLabel(MSGS.loginCode());
+ code.setFieldLabel(consoleMessages.loginCode());
code.addKeyListener(keyListener);
add(code);
// checkbox
trustCheckbox = new CheckBox();
trustCheckbox.setName("Trustpc");
- trustCheckbox.setBoxLabel(MSGS.loginDialogMfaBoxLabel());
+ trustCheckbox.setBoxLabel(consoleMessages.loginDialogMfaBoxLabel());
trustCheckbox.setLabelSeparator("");
- trustCheckbox.setToolTip(MSGS.userFormLockedTooltip());
+ trustCheckbox.setToolTip(consoleMessages.userFormLockedTooltip());
add(trustCheckbox);
if (this.isVisible()) {
@@ -138,7 +138,7 @@ protected void onSubmit() {
@Override
public void onFailure(Throwable caught) {
- ConsoleInfo.display(CORE_MSGS.loginError(), caught.getLocalizedMessage());
+ ConsoleInfo.display(consoleCoreMessages.loginError(), caught.getLocalizedMessage());
reset();
// Go back
@@ -174,7 +174,7 @@ protected void createButtons() {
super.createButtons();
status = new Status();
- status.setBusy(MSGS.waitMsg());
+ status.setBusy(consoleMessages.waitMsg());
status.hide();
status.setAutoWidth(true);
@@ -182,7 +182,7 @@ protected void createButtons() {
getButtonBar().add(new FillToolItem());
// submit
- submit = new Button(CORE_MSGS.loginLogin());
+ submit = new Button(consoleCoreMessages.loginLogin());
submit.addSelectionListener(new SelectionListener() {
@Override
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java
index 7f0ae26ddcd..acc76f76004 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java
@@ -12,6 +12,12 @@
*******************************************************************************/
package org.eclipse.kapua.app.console.core.client;
+import com.extjs.gxt.ui.client.Style.Scroll;
+import com.extjs.gxt.ui.client.event.ButtonEvent;
+import com.extjs.gxt.ui.client.event.SelectionListener;
+import com.extjs.gxt.ui.client.widget.button.Button;
+import com.extjs.gxt.ui.client.widget.layout.FitLayout;
+import com.google.gwt.core.client.GWT;
import org.eclipse.kapua.app.console.module.api.client.messages.ConsoleMessages;
import org.eclipse.kapua.app.console.module.api.client.resources.icons.KapuaIcon;
import org.eclipse.kapua.app.console.module.api.client.ui.dialog.SimpleDialog;
@@ -20,17 +26,10 @@
import org.eclipse.kapua.app.console.module.authentication.client.messages.ConsoleCredentialMessages;
import org.eclipse.kapua.app.console.module.authentication.client.tabs.credentials.MfaManagementPanel;
-import com.extjs.gxt.ui.client.Style.Scroll;
-import com.extjs.gxt.ui.client.event.ButtonEvent;
-import com.extjs.gxt.ui.client.event.SelectionListener;
-import com.extjs.gxt.ui.client.widget.button.Button;
-import com.extjs.gxt.ui.client.widget.layout.FitLayout;
-import com.google.gwt.core.client.GWT;
-
public class MfaManagementDialog extends SimpleDialog {
- private static final ConsoleCredentialMessages CREDENTIAL_MSGS = GWT.create(ConsoleCredentialMessages.class);
- private static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
+ private final ConsoleCredentialMessages credentialMessages = GWT.create(ConsoleCredentialMessages.class);
+ private final ConsoleMessages messages = GWT.create(ConsoleMessages.class);
private GwtSession currentSession;
@@ -60,7 +59,7 @@ public void submit() {
@Override
public String getHeaderMessage() {
- return CREDENTIAL_MSGS.mfaDialogHeader();
+ return credentialMessages.mfaDialogHeader();
}
@Override
@@ -96,7 +95,7 @@ public void componentSelected(ButtonEvent ce) {
@Override
protected String getCancelButtonText() {
- return MSGS.closeButton();
+ return messages.closeButton();
}
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java
index b72ad2cf34c..511ee36f3ad 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java
@@ -61,8 +61,8 @@
public class NorthView extends LayoutContainer {
- private static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
- private static final ConsoleCredentialMessages CREDENTIAL_MSGS = GWT.create(ConsoleCredentialMessages.class);
+ private final ConsoleMessages messages = GWT.create(ConsoleMessages.class);
+ private final ConsoleCredentialMessages credentialMessages = GWT.create(ConsoleCredentialMessages.class);
private final GwtAuthorizationServiceAsync gwtAuthorizationService = GWT.create(GwtAuthorizationService.class);
private final GwtAccountServiceAsync gwtAccountService = GWT.create(GwtAccountService.class);
@@ -184,7 +184,7 @@ public void handleEvent(BaseEvent be) {
// (only if the current user is an INTERNAL one; note that an INTERNAL user has no ssoIdToken)
if (currentSession.getOpenIDIdToken() == null) {
KapuaMenuItem changePassword = new KapuaMenuItem();
- changePassword.setText(MSGS.changePassword());
+ changePassword.setText(messages.changePassword());
changePassword.setIcon(IconSet.KEY);
changePassword.addSelectionListener(new SelectionListener() {
@@ -211,7 +211,7 @@ public void onSuccess(GwtMfaCredentialOptions gwtMfaCredentialOptions) {
}
KapuaMenuItem manageMfa = new KapuaMenuItem();
- manageMfa.setText(CREDENTIAL_MSGS.manageMfaMenuItem());
+ manageMfa.setText(credentialMessages.manageMfaMenuItem());
manageMfa.setIcon(IconSet.LOCK);
manageMfa.addSelectionListener(new SelectionListener() {
@@ -226,7 +226,7 @@ public void componentSelected(MenuEvent ce) {
userActionMenu.add(new SeparatorMenuItem());
// Logout menu item
KapuaMenuItem userLogoutMenuItem = new KapuaMenuItem();
- userLogoutMenuItem.setText(MSGS.consoleHeaderUserActionLogout());
+ userLogoutMenuItem.setText(messages.consoleHeaderUserActionLogout());
userLogoutMenuItem.setIcon(IconSet.SIGN_OUT);
userLogoutMenuItem.addSelectionListener(new SelectionListener() {
@@ -288,8 +288,8 @@ public void onSuccess(String result) {
*/
public MenuItem createAccountNavigationMenuItem() {
KapuaMenuItem mainAccountMenuItem = new KapuaMenuItem();
- mainAccountMenuItem.setText(MSGS.accountSelectorItemYourAccount(accountName));
- mainAccountMenuItem.setToolTip(MSGS.accountSelectorTooltipYourAccount());
+ mainAccountMenuItem.setText(messages.accountSelectorItemYourAccount(accountName));
+ mainAccountMenuItem.setToolTip(messages.accountSelectorTooltipYourAccount());
mainAccountMenuItem.setIcon(IconSet.USER_MD);
mainAccountMenuItem.setId(accountId);
mainAccountMenuItem.addSelectionListener(switchToAccountListener);
@@ -303,7 +303,7 @@ public MenuItem createAccountNavigationMenuItem() {
populateNavigatorMenu(subAccountMenu, accountId);
KapuaMenuItem switchToAccountMenuItem = new KapuaMenuItem();
- switchToAccountMenuItem.setText(MSGS.consoleHeaderUserActionSwitchToAccount());
+ switchToAccountMenuItem.setText(messages.consoleHeaderUserActionSwitchToAccount());
switchToAccountMenuItem.setIcon(IconSet.USERS);
switchToAccountMenuItem.setSubMenu(subAccountMenu);
@@ -319,8 +319,8 @@ public MenuItem createAccountNavigationMenuItem() {
*/
private void populateNavigatorMenu(final Menu menu, String accountId) {
final KapuaMenuItem loadingChildAccounts;
- loadingChildAccounts = new KapuaMenuItem(MSGS.accountSelectorLoadingChildAccounts());
- loadingChildAccounts.setToolTip(MSGS.accountSelectorTooltipYourAccount());
+ loadingChildAccounts = new KapuaMenuItem(messages.accountSelectorLoadingChildAccounts());
+ loadingChildAccounts.setToolTip(messages.accountSelectorTooltipYourAccount());
loadingChildAccounts.setIcon(IconSet.USER_MD);
loadingChildAccounts.setId(accountId);
loadingChildAccounts.disable();
@@ -339,7 +339,7 @@ public void onSuccess(GwtAccount result) {
// If no children are found, add "No Child" label
if (result.getChildAccounts() != null && result.getChildAccounts().isEmpty()) {
menu.remove(loadingChildAccounts);
- MenuItem noChildMenuItem = new MenuItem(MSGS.accountSelectorItemNoChild());
+ MenuItem noChildMenuItem = new MenuItem(messages.accountSelectorItemNoChild());
noChildMenuItem.disable();
menu.add(noChildMenuItem);
} else {
@@ -387,7 +387,7 @@ private void switchToAccount(MenuEvent ce) {
String accountIdString = ce.getItem().getId();
// Mask the whole page
- parent.getViewport().mask(MSGS.accountSelectorMenuMaskLoading(accountName));
+ parent.getViewport().mask(messages.accountSelectorMenuMaskLoading(accountName));
gwtAccountService.find(accountIdString, new AsyncCallback() {
@@ -451,7 +451,7 @@ private void updateUserActionButtonLabel() {
userDisplayName = username;
}
- userActionButton.setText(MSGS.consoleHeaderUserActionButtonLabel(userDisplayName, accountName));
+ userActionButton.setText(messages.consoleHeaderUserActionButtonLabel(userDisplayName, accountName));
}
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java
index 4b894e95558..bad2847d0f8 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java
@@ -65,7 +65,7 @@
public class WestNavigationView extends LayoutContainer {
- private static final ConsoleMessages MSGS = GWT.create(ConsoleMessages.class);
+ private final ConsoleMessages messages = GWT.create(ConsoleMessages.class);
private final LayoutContainer centerPanel;
private final KapuaCloudConsole kapuaCloudConsole;
@@ -147,7 +147,7 @@ public void onSuccess(final List additionalViewDescriptors)
accountManagementPanel = new ContentPanel();
accountManagementPanel.setBorders(false);
accountManagementPanel.setBodyBorder(false);
- accountManagementPanel.setHeading(MSGS.manageHeading());
+ accountManagementPanel.setHeading(messages.manageHeading());
cloudResourcesTreeStore = new TreeStore();
accountManagementTreeStore = new TreeStore();
@@ -175,8 +175,8 @@ public void selectionChanged(final SelectionChangedEvent se) {
if ((currentSession.isFormDirty()) && (!skipNextSelChange)) {
// ask for confirmation before switching
- MessageBox.confirm(MSGS.confirm(),
- MSGS.unsavedChanges(),
+ MessageBox.confirm(messages.confirm(),
+ messages.unsavedChanges(),
new Listener() {
@Override
@@ -301,7 +301,7 @@ public void onSuccess(GwtAccount result) {
settingView.setAccount(result);
panel.setIcon(new KapuaIcon(IconSet.COG));
- panel.setHeading(MSGS.settings());
+ panel.setHeading(messages.settings());
panel.add(settingView);
centerPanel.add(panel);
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/filter/KapuaWebFilter.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/filter/KapuaWebFilter.java
index 298225ae7a5..906f39f31b4 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/filter/KapuaWebFilter.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/filter/KapuaWebFilter.java
@@ -44,10 +44,8 @@ public class KapuaWebFilter extends ShiroFilter {
private static final Logger LOG = LoggerFactory.getLogger(KapuaWebFilter.class);
- private static final KapuaLocator LOCATOR = KapuaLocator.getInstance();
-
- private static final AuthenticationService AUTHENTICATION_SERVICE = LOCATOR.getService(AuthenticationService.class);
- private static final CredentialsFactory CREDENTIALS_FACTORY = LOCATOR.getFactory(CredentialsFactory.class);
+ private final AuthenticationService authenticationService = KapuaLocator.getInstance().getService(AuthenticationService.class);
+ private final CredentialsFactory credentialsFactory = KapuaLocator.getInstance().getFactory(CredentialsFactory.class);
@Override
protected void executeChain(ServletRequest request, ServletResponse response, FilterChain origChain)
@@ -105,10 +103,10 @@ protected void checkAndRefreshAccessTokenIfExpired(AccessToken accessToken) thro
SecurityUtils.getSubject().logout();
// Get a new AccessToken from the current AccessToken.refreshToken
- AccessToken refreshAccessToken = AUTHENTICATION_SERVICE.refreshAccessToken(accessToken.getTokenId(), accessToken.getRefreshToken());
+ AccessToken refreshAccessToken = authenticationService.refreshAccessToken(accessToken.getTokenId(), accessToken.getRefreshToken());
// Authenticate with the refreshed AccessToken
- AUTHENTICATION_SERVICE.authenticate(CREDENTIALS_FACTORY.newAccessTokenCredentials(refreshAccessToken.getTokenId()));
+ authenticationService.authenticate(credentialsFactory.newAccessTokenCredentials(refreshAccessToken.getTokenId()));
} else if (now.after(accessToken.getRefreshExpiresOn())) {
throw new AuthenticationException("AccessToken.refreshToken is expired!");
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtAuthorizationServiceImpl.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtAuthorizationServiceImpl.java
index 4532c8e87f2..5fa08ddf2ba 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtAuthorizationServiceImpl.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtAuthorizationServiceImpl.java
@@ -46,7 +46,6 @@
import org.eclipse.kapua.service.authentication.CredentialsFactory;
import org.eclipse.kapua.service.authentication.JwtCredentials;
import org.eclipse.kapua.service.authentication.UsernamePasswordCredentials;
-import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionService;
import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationErrorCodes;
import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationException;
import org.eclipse.kapua.service.authentication.registration.RegistrationService;
@@ -100,7 +99,7 @@ public class GwtAuthorizationServiceImpl extends KapuaRemoteServiceServlet imple
private static final RegistrationService REGISTRATION_SERVICE = LOCATOR.getService(RegistrationService.class);
private static final UserService USER_SERVICE = LOCATOR.getService(UserService.class);
- private static final MfaOptionService MFA_OPTION_SERVICE = LOCATOR.getService(MfaOptionService.class);
+ private static final DatastoreSettings DATASTORE_SETTINGS = LOCATOR.getComponent(DatastoreSettings.class);
/**
* Login call in response to the login dialog.
@@ -286,7 +285,7 @@ public Account call() throws Exception {
gwtSession.setBuildVersion(commonsConfig.getString(SystemSettingKey.BUILD_REVISION));
gwtSession.setBuildNumber(commonsConfig.getString(SystemSettingKey.BUILD_NUMBER));
gwtSession.setSsoEnabled(ConsoleSsoLocator.getLocator(this).getService().isEnabled());
- gwtSession.setDatastoreDisabled(DatastoreSettings.getInstance().getBoolean(DatastoreSettingsKey.DISABLE_DATASTORE, false));
+ gwtSession.setDatastoreDisabled(DATASTORE_SETTINGS.getBoolean(DatastoreSettingsKey.DISABLE_DATASTORE, false));
// Account Info
gwtSession.setAccountId(gwtAccount.getId());
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtSettingsServiceImpl.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtSettingsServiceImpl.java
index 093ad35e388..ec47d5b8a11 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtSettingsServiceImpl.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/GwtSettingsServiceImpl.java
@@ -31,6 +31,7 @@ public class GwtSettingsServiceImpl extends RemoteServiceServlet implements GwtS
private static final long serialVersionUID = -6876999298300071273L;
+ //Injection not supported here, unfortunately
private static final ConsoleSetting CONSOLE_SETTINGS = ConsoleSetting.getInstance();
@Override
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/util/SsoLocatorListener.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/util/SsoLocatorListener.java
index 455f8db7396..09d4de64f21 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/util/SsoLocatorListener.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/server/util/SsoLocatorListener.java
@@ -12,8 +12,8 @@
*******************************************************************************/
package org.eclipse.kapua.app.console.core.server.util;
+import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.plugin.sso.openid.OpenIDLocator;
-import org.eclipse.kapua.plugin.sso.openid.provider.ProviderOpenIDLocator;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -23,28 +23,20 @@ public class SsoLocatorListener implements ServletContextListener {
private static final String SSO_CONTEXT_KEY = "ssoLocatorListener";
- private ProviderOpenIDLocator context;
+ private OpenIDLocator openIDLocator = KapuaLocator.getInstance().getComponent(OpenIDLocator.class);
@Override
public void contextInitialized(ServletContextEvent event) {
- this.context = new ProviderOpenIDLocator();
-
event.getServletContext().setAttribute(SSO_CONTEXT_KEY, this);
}
@Override
public void contextDestroyed(ServletContextEvent event) {
event.getServletContext().removeAttribute(SSO_CONTEXT_KEY);
-
- try {
- this.context.close();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
}
static OpenIDLocator getLocator(ServletContext context) {
- return ((SsoLocatorListener) context.getAttribute(SSO_CONTEXT_KEY)).context;
+ return ((SsoLocatorListener) context.getAttribute(SSO_CONTEXT_KEY)).openIDLocator;
}
}
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/FileServlet.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/FileServlet.java
index e28b2dbc2c0..08235e96e30 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/FileServlet.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/FileServlet.java
@@ -53,6 +53,20 @@ public class FileServlet extends KapuaHttpServlet {
private static final String SCOPE_ID_STRING = "scopeIdString";
private static final String DEVICE_ID_STRING = "deviceIdString";
+ private final DeviceConfigurationManagementService deviceConfigurationManagementService;
+ private final DeviceCommandManagementService deviceCommandManagementService;
+ private final DeviceCommandFactory deviceCommandFactory;
+ private final ConsoleSetting config;
+
+ public FileServlet() {
+ //Injection not supported here, unfortunately
+ KapuaLocator locator = KapuaLocator.getInstance();
+ deviceConfigurationManagementService = locator.getService(DeviceConfigurationManagementService.class);
+ deviceCommandManagementService = locator.getService(DeviceCommandManagementService.class);
+ deviceCommandFactory = locator.getFactory(DeviceCommandFactory.class);
+ config = ConsoleSetting.getInstance();
+ }
+
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
@@ -103,9 +117,6 @@ private void doPostConfigurationSnapshot(KapuaFormFields kapuaFormFields, HttpSe
throw new IllegalArgumentException("configuration");
}
- KapuaLocator locator = KapuaLocator.getInstance();
- DeviceConfigurationManagementService deviceConfigurationManagementService = locator.getService(DeviceConfigurationManagementService.class);
-
FileItem fileItem = fileItems.get(0);
byte[] data = fileItem.get();
String xmlConfigurationString = new String(data, CharEncoding.UTF_8);
@@ -167,13 +178,9 @@ private void doPostCommand(KapuaFormFields kapuaFormFields, HttpServletResponse
timeout = Integer.parseInt(timeoutString);
}
- KapuaLocator locator = KapuaLocator.getInstance();
- DeviceCommandManagementService deviceService = locator.getService(DeviceCommandManagementService.class);
-
// FIXME: set a max size on the MQtt payload
byte[] data = fileItems.isEmpty() ? null : fileItems.get(0).get();
- DeviceCommandFactory deviceCommandFactory = locator.getFactory(DeviceCommandFactory.class);
DeviceCommandInput commandInput = deviceCommandFactory.newCommandInput();
StringTokenizer st = new StringTokenizer(command);
@@ -196,7 +203,7 @@ private void doPostCommand(KapuaFormFields kapuaFormFields, HttpServletResponse
commandInput.setWorkingDir("/tmp/");
commandInput.setBody(data);
- DeviceCommandOutput deviceCommandOutput = deviceService.exec(KapuaEid.parseCompactId(scopeIdString),
+ DeviceCommandOutput deviceCommandOutput = deviceCommandManagementService.exec(KapuaEid.parseCompactId(scopeIdString),
KapuaEid.parseCompactId(deviceIdString),
commandInput,
null);
@@ -268,8 +275,6 @@ private void doGetIconResource(HttpServletRequest request, HttpServletResponse r
filePathSb.append("/");
}
- ConsoleSetting config = ConsoleSetting.getInstance();
-
filePathSb.append(config.getString(ConsoleSettingKeys.DEVICE_CONFIGURATION_ICON_FOLDER))
.append("/")
.append(id);
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/KapuaHttpServlet.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/KapuaHttpServlet.java
index 01665405656..8ed99063224 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/KapuaHttpServlet.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/KapuaHttpServlet.java
@@ -12,23 +12,22 @@
*******************************************************************************/
package org.eclipse.kapua.app.console.core.servlet;
-import java.io.File;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.FileCleanerCleanup;
import org.apache.commons.io.FileCleaningTracker;
+import org.eclipse.kapua.app.console.core.shared.model.KapuaFormFields;
import org.eclipse.kapua.app.console.module.api.setting.ConsoleSetting;
import org.eclipse.kapua.app.console.module.api.setting.ConsoleSettingKeys;
-import org.eclipse.kapua.app.console.core.shared.model.KapuaFormFields;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+
public class KapuaHttpServlet extends HttpServlet {
private static final long serialVersionUID = 8120495078076069807L;
@@ -36,6 +35,8 @@ public class KapuaHttpServlet extends HttpServlet {
protected DiskFileItemFactory diskFileItemFactory;
protected FileCleaningTracker fileCleaningTracker;
+ //Injection not supported here, unfortunately
+ private ConsoleSetting consoleSetting = ConsoleSetting.getInstance();
@Override
public void init() throws ServletException {
@@ -46,7 +47,7 @@ public void init() throws ServletException {
ServletContext ctx = getServletContext();
fileCleaningTracker = FileCleanerCleanup.getFileCleaningTracker(ctx);
- int sizeThreshold = ConsoleSetting.getInstance().getInt(ConsoleSettingKeys.FILE_UPLOAD_INMEMORY_SIZE_THRESHOLD);
+ int sizeThreshold = consoleSetting.getInt(ConsoleSettingKeys.FILE_UPLOAD_INMEMORY_SIZE_THRESHOLD);
File repository = new File(System.getProperty("java.io.tmpdir"));
logger.info("DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD: {}", DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD);
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/SkinServlet.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/SkinServlet.java
index 2722e798c8c..2b2ab82a92c 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/SkinServlet.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/SkinServlet.java
@@ -12,10 +12,9 @@
*******************************************************************************/
package org.eclipse.kapua.app.console.core.servlet;
+import org.apache.commons.io.FileUtils;
import org.eclipse.kapua.app.console.module.api.setting.ConsoleSetting;
import org.eclipse.kapua.app.console.module.api.setting.ConsoleSettingKeys;
-
-import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +32,8 @@ public class SkinServlet extends HttpServlet {
private static final long serialVersionUID = -5374075152873372059L;
private static final Logger LOGGER = LoggerFactory.getLogger(SkinServlet.class);
+ //Injection not supported here, unfortunately
+ private ConsoleSetting consoleSetting = ConsoleSetting.getInstance();
@Override
public void doGet(HttpServletRequest request, HttpServletResponse response) {
@@ -43,7 +44,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
w = response.getWriter();
// check to see if we have an external resource directory configured
- ConsoleSetting consoleSetting = ConsoleSetting.getInstance();
+ ConsoleSetting consoleSetting = this.consoleSetting;
String resourceDir = consoleSetting.getString(ConsoleSettingKeys.SKIN_RESOURCE_DIR);
if (resourceDir != null && resourceDir.trim().length() != 0) {
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/UploadRequest.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/UploadRequest.java
index 4072c8c358b..021c399b4a1 100644
--- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/UploadRequest.java
+++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/UploadRequest.java
@@ -34,10 +34,11 @@ class UploadRequest extends ServletFileUpload {
private final Map formFields;
private final List fileItems;
+ private final ConsoleSetting consoleSetting = ConsoleSetting.getInstance();
public UploadRequest(DiskFileItemFactory diskFileItemFactory) {
super(diskFileItemFactory);
- setSizeMax(ConsoleSetting.getInstance().getLong(ConsoleSettingKeys.FILE_UPLOAD_SIZE_MAX));
+ setSizeMax(consoleSetting.getLong(ConsoleSettingKeys.FILE_UPLOAD_SIZE_MAX));
formFields = new HashMap();
fileItems = new ArrayList();
}
diff --git a/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/shared/util/GwtKapuaAccountModelConverter.java b/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/shared/util/GwtKapuaAccountModelConverter.java
index c73be803e38..646263ad66b 100644
--- a/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/shared/util/GwtKapuaAccountModelConverter.java
+++ b/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/shared/util/GwtKapuaAccountModelConverter.java
@@ -17,9 +17,9 @@
import org.apache.commons.lang3.StringUtils;
import org.eclipse.kapua.app.console.module.account.shared.model.GwtAccountQuery;
import org.eclipse.kapua.app.console.module.api.shared.util.GwtKapuaCommonsModelConverter;
+import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.model.query.FieldSortCriteria;
import org.eclipse.kapua.model.query.SortOrder;
-import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.model.query.predicate.AndPredicate;
import org.eclipse.kapua.model.query.predicate.AttributePredicate.Operator;
import org.eclipse.kapua.service.account.AccountAttributes;
diff --git a/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/server/util/KapuaExceptionHandler.java b/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/server/util/KapuaExceptionHandler.java
index a084fed5f50..6ccdbf7fafc 100644
--- a/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/server/util/KapuaExceptionHandler.java
+++ b/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/server/util/KapuaExceptionHandler.java
@@ -50,6 +50,7 @@
public class KapuaExceptionHandler {
private static final Logger LOG = LoggerFactory.getLogger(KapuaExceptionHandler.class);
+ private static final SystemSetting SYSTEM_SETTING = SystemSetting.getInstance();
private KapuaExceptionHandler() {
}
@@ -204,7 +205,7 @@ else if (throwable instanceof KapuaDuplicateExternalIdException || throwable ins
return new GwtKapuaException(GwtKapuaErrorCode.ENTITY_UNIQUENESS, throwable, errorFieldsSb.toString());
} else if (throwable instanceof KapuaIllegalArgumentException) {
KapuaIllegalArgumentException kiae = (KapuaIllegalArgumentException) throwable;
- if (kiae.getArgumentName().equals("name") && kiae.getArgumentValue().equals(SystemSetting.getInstance().getString(SystemSettingKey.SYS_ADMIN_USERNAME))) {
+ if (kiae.getArgumentName().equals("name") && kiae.getArgumentValue().equals(SYSTEM_SETTING.getString(SystemSettingKey.SYS_ADMIN_USERNAME))) {
return new GwtKapuaException(GwtKapuaErrorCode.OPERATION_NOT_ALLOWED_ON_ADMIN_USER, throwable);
} else {
return new GwtKapuaException(GwtKapuaErrorCode.ILLEGAL_ARGUMENT, throwable, ((KapuaIllegalArgumentException) throwable).getArgumentName(), ((KapuaIllegalArgumentException) throwable).getArgumentValue());
diff --git a/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/shared/util/KapuaGwtCommonsModelConverter.java b/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/shared/util/KapuaGwtCommonsModelConverter.java
index 7c3a6f4efb7..f3b777f2e36 100644
--- a/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/shared/util/KapuaGwtCommonsModelConverter.java
+++ b/console/module/api/src/main/java/org/eclipse/kapua/app/console/module/api/shared/util/KapuaGwtCommonsModelConverter.java
@@ -267,7 +267,7 @@ private KapuaGwtCommonsModelConverter() {
// gwtDomain = GwtDomain.access_info;
// } else if (new AccessTokenDomain().getName().equals(domain)) {
// gwtDomain = GwtDomain.access_token;
-// } else if (new AccountDomain().getName().equals(domain)) {
+// } else if (Domains.ACCOUNT.getName().equals(domain)) {
// gwtDomain = GwtDomain.account;
// } else if (new BrokerDomain().getName().equals(domain)) {
// gwtDomain = GwtDomain.broker;
diff --git a/console/module/authentication/src/main/java/org/eclipse/kapua/app/console/module/authentication/server/GwtCredentialServiceImpl.java b/console/module/authentication/src/main/java/org/eclipse/kapua/app/console/module/authentication/server/GwtCredentialServiceImpl.java
index e27e6cd82e4..6ded39b7c6c 100644
--- a/console/module/authentication/src/main/java/org/eclipse/kapua/app/console/module/authentication/server/GwtCredentialServiceImpl.java
+++ b/console/module/authentication/src/main/java/org/eclipse/kapua/app/console/module/authentication/server/GwtCredentialServiceImpl.java
@@ -81,6 +81,7 @@ public class GwtCredentialServiceImpl extends KapuaRemoteServiceServlet implemen
private static final UserCredentialsService USER_CREDENTIALS_SERVICE = LOCATOR.getService(UserCredentialsService.class);
private static final UserCredentialsFactory USER_CREDENTIALS_FACTORY = LOCATOR.getFactory(UserCredentialsFactory.class);
+ private static final AuthenticationUtils AUTHENTICATION_UTILS = LOCATOR.getComponent(AuthenticationUtils.class);
// this should be removed due to the refactoring in fixPasswordValidationBypass method
private static final int SYSTEM_MAXIMUM_PASSWORD_LENGTH = 255;
@@ -185,7 +186,7 @@ public GwtCredential update(GwtXSRFToken gwtXsrfToken, GwtCredential gwtCredenti
// Update
if (StringUtils.isNotEmpty(StringUtils.strip(gwtCredential.getCredentialKey()))) {
- String encryptedPass = AuthenticationUtils.cryptCredential(CryptAlgorithm.BCRYPT, gwtCredential.getCredentialKey());
+ String encryptedPass = AUTHENTICATION_UTILS.cryptCredential(CryptAlgorithm.BCRYPT, gwtCredential.getCredentialKey());
gwtCredential.setCredentialKey(encryptedPass);
} else {
Credential currentCredential = CREDENTIAL_SERVICE.find(scopeId, credentialId);
diff --git a/console/web/src/main/java/org/eclipse/kapua/app/console/AppModule.java b/console/web/src/main/java/org/eclipse/kapua/app/console/AppModule.java
new file mode 100644
index 00000000000..051104a884e
--- /dev/null
+++ b/console/web/src/main/java/org/eclipse/kapua/app/console/AppModule.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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.app.console;
+
+import com.google.inject.Provides;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+
+import javax.inject.Named;
+
+public class AppModule extends AbstractKapuaModule {
+ @Override
+ protected void configureModule() {
+
+ }
+
+ @Provides
+ @Named("metricModuleName")
+ String metricModuleName() {
+ return "web-console";
+ }
+}
diff --git a/console/web/src/main/java/org/eclipse/kapua/app/console/server/util/ConsoleListener.java b/console/web/src/main/java/org/eclipse/kapua/app/console/server/util/ConsoleListener.java
index 496adb3834f..59a5e4b4a78 100644
--- a/console/web/src/main/java/org/eclipse/kapua/app/console/server/util/ConsoleListener.java
+++ b/console/web/src/main/java/org/eclipse/kapua/app/console/server/util/ConsoleListener.java
@@ -12,16 +12,9 @@
*******************************************************************************/
package org.eclipse.kapua.app.console.server.util;
-import com.google.common.base.MoreObjects;
import org.eclipse.kapua.KapuaException;
import org.eclipse.kapua.app.console.ConsoleJAXBContextProvider;
import org.eclipse.kapua.commons.core.ServiceModuleBundle;
-import org.eclipse.kapua.commons.jpa.JdbcConnectionUrlResolvers;
-import org.eclipse.kapua.commons.liquibase.KapuaLiquibaseClient;
-import org.eclipse.kapua.commons.metric.CommonsMetric;
-import org.eclipse.kapua.commons.populators.DataPopulatorRunner;
-import org.eclipse.kapua.commons.setting.system.SystemSetting;
-import org.eclipse.kapua.commons.setting.system.SystemSettingKey;
import org.eclipse.kapua.commons.util.xml.JAXBContextProvider;
import org.eclipse.kapua.commons.util.xml.XmlUtil;
import org.eclipse.kapua.locator.KapuaLocator;
@@ -39,16 +32,12 @@ public class ConsoleListener implements ServletContextListener {
private static final Logger LOG = LoggerFactory.getLogger(ConsoleListener.class);
- private static final SystemSetting SYSTEM_SETTING = SystemSetting.getInstance();
-
private ServiceModuleBundle moduleBundle;
@Override
public void contextInitialized(final ServletContextEvent event) {
try {
LOG.info("Initialize Console JABContext Provider...");
- //TODO to be injected!!!
- CommonsMetric.module = "web-console";
JAXBContextProvider consoleProvider = new ConsoleJAXBContextProvider();
XmlUtil.setContextProvider(consoleProvider);
LOG.info("Initialize Console JABContext Provider... DONE!");
@@ -56,32 +45,6 @@ public void contextInitialized(final ServletContextEvent event) {
LOG.error("Initialize Console JABContext Provider... ERROR! Error: {}", e.getMessage(), e);
throw new ExceptionInInitializerError(e);
}
-
- if (SYSTEM_SETTING.getBoolean(SystemSettingKey.DB_SCHEMA_UPDATE, false)) {
- try {
- String dbUsername = SYSTEM_SETTING.getString(SystemSettingKey.DB_USERNAME);
- String dbPassword = SYSTEM_SETTING.getString(SystemSettingKey.DB_PASSWORD);
- String schema = MoreObjects.firstNonNull(
- SYSTEM_SETTING.getString(SystemSettingKey.DB_SCHEMA_ENV),
- SYSTEM_SETTING.getString(SystemSettingKey.DB_SCHEMA)
- );
-
- // Loading JDBC Driver
- String jdbcDriver = SYSTEM_SETTING.getString(SystemSettingKey.DB_JDBC_DRIVER);
- try {
- Class.forName(jdbcDriver);
- } catch (ClassNotFoundException e) {
- LOG.warn("Could not find jdbc driver: {}. Subsequent DB operation failures may occur...", SYSTEM_SETTING.getString(SystemSettingKey.DB_JDBC_DRIVER));
- }
-
- // Starting Liquibase Client
- new KapuaLiquibaseClient(JdbcConnectionUrlResolvers.resolveJdbcUrl(), dbUsername, dbPassword, schema).update();
- } catch (Exception e) {
- throw new ExceptionInInitializerError(e);
- }
- KapuaLocator.getInstance().getService(DataPopulatorRunner.class).runPopulators();
- }
-
// Start Quartz scheduler
try {
LOG.info("Starting Quartz scheduler...");
@@ -96,7 +59,7 @@ public void contextInitialized(final ServletContextEvent event) {
try {
LOG.info("Starting service modules...");
if (moduleBundle == null) {
- moduleBundle = KapuaLocator.getInstance().getService(ServiceModuleBundle.class);
+ moduleBundle = KapuaLocator.getInstance().getComponent(ServiceModuleBundle.class);
}
moduleBundle.startup();
LOG.info("Starting service modules... DONE!");
diff --git a/console/web/src/main/resources/locator.xml b/console/web/src/main/resources/locator.xml
index 1f40a84664c..b21621ce6b3 100644
--- a/console/web/src/main/resources/locator.xml
+++ b/console/web/src/main/resources/locator.xml
@@ -18,10 +18,14 @@
+ org.eclipse.kapua.app.console
+ org.eclipse.kapua.plugin.sso
org.eclipse.kapua.commons
org.eclipse.kapua.job.engine.client
org.eclipse.kapua.message
org.eclipse.kapua.service
+ org.eclipse.kapua.security
+ org.eclipse.kapua.translator
org.eclipse.kapua.transport
diff --git a/consumer/lifecycle-app/pom.xml b/consumer/lifecycle-app/pom.xml
index 54a5eab6431..36e01addf54 100644
--- a/consumer/lifecycle-app/pom.xml
+++ b/consumer/lifecycle-app/pom.xml
@@ -40,6 +40,11 @@
org.eclipse.kapua
kapua-consumer-lifecycle