Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Minor updates to provisioning code

Rich Turnerb4c49057057f
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java
index f003cf081..321d2f8e7 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningResourceImpl.java
@@ -35,17 +35,17 @@ public class ProvisioningResourceImpl implements ProvisioningResource {
}
@Override
- public ProvisioningConfig<?> getProvisioningConfigs() {
+ public ProvisioningConfig<?, ?> getProvisioningConfigs() {
return null;
}
@Override
- public long createProvisioningConfig(ProvisioningConfig<?> provisioningConfig) {
+ public long createProvisioningConfig(ProvisioningConfig<?, ?> provisioningConfig) {
return 0;
}
@Override
- public void updateProvisioningConfig(RequestParams requestParams, Long id, ProvisioningConfig<?> provisioningConfig) {
+ public void updateProvisioningConfig(RequestParams requestParams, Long id, ProvisioningConfig<?, ?> provisioningConfig) {
}
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
index 575262476..db40fb190 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/ProvisioningService.java
@@ -68,11 +68,11 @@ public class ProvisioningService implements ContainerService {
}
- public <T extends ProvisioningConfig<?>> T merge(T provisioningConfig) {
+ public <T extends ProvisioningConfig<?, ?>> T merge(T provisioningConfig) {
return persistenceService.doReturningTransaction(entityManager -> {
// Do standard JSR-380 validation on the config
- Set<ConstraintViolation<ProvisioningConfig<?>>> validationFailures = ValueUtil.validate(provisioningConfig);
+ Set<ConstraintViolation<ProvisioningConfig<?, ?>>> validationFailures = ValueUtil.validate(provisioningConfig);
if (validationFailures.size() > 0) {
String msg = "Provisioning config merge failed as failed constraint validation: config=" + provisioningConfig;
@@ -94,7 +94,7 @@ public class ProvisioningService implements ContainerService {
public void delete(Long id) {
persistenceService.doTransaction(entityManager -> {
- ProvisioningConfig<?> provisioningConfig = entityManager.find(ProvisioningConfig.class, id);
+ ProvisioningConfig<?, ?> provisioningConfig = entityManager.find(ProvisioningConfig.class, id);
if (provisioningConfig != null)
entityManager.remove(provisioningConfig);
});
diff --git a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
index d102ea80b..7e43b9237 100644
--- a/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/provisioning/UserAssetProvisioningMQTTHandler.java
@@ -338,7 +338,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
.orElse(null);
}
- protected User createClientServiceUser(String realm, String username, ProvisioningConfig<?> provisioningConfig) {
+ protected User createClientServiceUser(String realm, String username, ProvisioningConfig<?, ?> provisioningConfig) {
LOG.fine("Creating client service user: realm=" + realm + ", username=" + username);
User serviceUser = new User()
@@ -371,7 +371,7 @@ public class UserAssetProvisioningMQTTHandler extends MQTTHandler {
return serviceUser;
}
- protected Asset<?> createClientAsset(String realm, String assetId, String uniqueId, User serviceUser, ProvisioningConfig<?> provisioningConfig) throws RuntimeException {
+ protected Asset<?> createClientAsset(String realm, String assetId, String uniqueId, User serviceUser, ProvisioningConfig<?, ?> provisioningConfig) throws RuntimeException {
LOG.fine("Creating client asset: realm=" + realm + ", username=" + serviceUser.getUsername());
if (TextUtil.isNullOrEmpty(provisioningConfig.getAssetTemplate())) {
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java
index 8d407748f..8718638bb 100644
--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java
@@ -34,6 +34,7 @@ import java.util.Date;
import static javax.persistence.DiscriminatorType.STRING;
import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;
+@SuppressWarnings("unchecked")
@Entity
@Table(name = "provisioning_config")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@@ -42,7 +43,7 @@ import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;
@JsonSubTypes(
@JsonSubTypes.Type(name = "x509", value = X509ProvisioningConfig.class)
)
-public abstract class ProvisioningConfig<T> {
+public abstract class ProvisioningConfig<T, U extends ProvisioningConfig<T, U>> {
@Id
@Column(name = "ID")
@@ -113,9 +114,9 @@ public abstract class ProvisioningConfig<T> {
return name;
}
- public ProvisioningConfig<T> setName(String name) {
+ public U setName(String name) {
this.name = name;
- return this;
+ return (U)this;
}
public String getType() {
@@ -126,51 +127,51 @@ public abstract class ProvisioningConfig<T> {
return assetTemplate;
}
- public ProvisioningConfig<T> setAssetTemplate(String assetTemplate) {
+ public U setAssetTemplate(String assetTemplate) {
this.assetTemplate = assetTemplate;
- return this;
+ return (U)this;
}
public boolean isRestrictedUser() {
return restrictedUser;
}
- public ProvisioningConfig<T> setRestrictedUser(boolean restrictedUser) {
+ public U setRestrictedUser(boolean restrictedUser) {
this.restrictedUser = restrictedUser;
- return this;
+ return (U)this;
}
public ClientRole[] getUserRoles() {
return userRoles;
}
- public ProvisioningConfig<T> setUserRoles(ClientRole[] userRoles) {
+ public U setUserRoles(ClientRole[] userRoles) {
this.userRoles = userRoles;
- return this;
+ return (U)this;
}
public boolean isDisabled() {
return disabled;
}
- public ProvisioningConfig<T> setDisabled(boolean disabled) {
+ public U setDisabled(boolean disabled) {
this.disabled = disabled;
- return this;
+ return (U)this;
}
/**
* Implementors must annotate the data field with @Column as JPA (Hibernate) doesn't work with generic fields
*/
public abstract T getData();
- public abstract ProvisioningConfig<T> setData(T data);
+ public abstract U setData(T data);
public String getRealm() {
return realm;
}
- public ProvisioningConfig<T> setRealm(String realm) {
+ public U setRealm(String realm) {
this.realm = realm;
- return this;
+ return (U)this;
}
@Override
diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
index 315c97a92..71c4f2f9b 100644
--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningResource.java
@@ -33,19 +33,19 @@ public interface ProvisioningResource {
@GET
@Produces(APPLICATION_JSON)
@RolesAllowed({Constants.REALM_ADMIN_ROLE})
- ProvisioningConfig<?> getProvisioningConfigs();
+ ProvisioningConfig<?, ?> getProvisioningConfigs();
@POST
@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON)
@RolesAllowed({Constants.REALM_ADMIN_ROLE})
- long createProvisioningConfig(ProvisioningConfig<?> provisioningConfig);
+ long createProvisioningConfig(ProvisioningConfig<?, ?> provisioningConfig);
@PUT
@Path("{id}")
@Consumes(APPLICATION_JSON)
@RolesAllowed({Constants.REALM_ADMIN_ROLE})
- void updateProvisioningConfig(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid ProvisioningConfig<?> provisioningConfig);
+ void updateProvisioningConfig(@BeanParam RequestParams requestParams, @PathParam("id") Long id, @Valid ProvisioningConfig<?, ?> provisioningConfig);
@DELETE
@Path("{id}")
diff --git a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java
index 254811a35..3068410eb 100644
--- a/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java
+++ b/model/src/main/java/org/openremote/model/provisioning/X509ProvisioningConfig.java
@@ -32,7 +32,7 @@ import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;
@Entity
@DiscriminatorValue("x509")
-public class X509ProvisioningConfig extends ProvisioningConfig<X509ProvisioningData> {
+public class X509ProvisioningConfig extends ProvisioningConfig<X509ProvisioningData, X509ProvisioningConfig> {
@Transient
protected X509Certificate certificate;
@@ -51,7 +51,7 @@ public class X509ProvisioningConfig extends ProvisioningConfig<X509ProvisioningD
}
@Override
- public ProvisioningConfig<X509ProvisioningData> setData(X509ProvisioningData data) {
+ public X509ProvisioningConfig setData(X509ProvisioningData data) {
this.data = data;
return this;
}