Skip to content

armgit / core

Public Imported from GitHub
0

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

Moved test resources and bug fix for NotificationResourceImpl

Rich Turner1c9747607bce
diff --git a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
index e8dc49c9f..3858e6c9a 100644
--- a/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/notification/NotificationResourceImpl.java
@@ -113,23 +113,11 @@ public class NotificationResourceImpl extends WebResource implements Notificatio
headers.put(Constants.AUTH_CONTEXT, getAuthContext());
}
- Object result = messageBrokerService.getProducerTemplate().requestBodyAndHeaders(
- NotificationService.NOTIFICATION_QUEUE, notification, headers);
-
- if (result instanceof NotificationProcessingException) {
- NotificationProcessingException processingException = (NotificationProcessingException) result;
- switch (processingException.getReason()) {
-
- case INSUFFICIENT_ACCESS:
- throw new WebApplicationException(processingException.getMessage(), FORBIDDEN);
- case MISSING_SOURCE:
- case MISSING_NOTIFICATION:
- case MISSING_MESSAGE:
- case MISSING_TARGETS:
- throw new WebApplicationException(processingException.getMessage(), BAD_REQUEST);
- case UNSUPPORTED_MESSAGE_TYPE:
- throw new IllegalStateException(processingException);
- }
+ boolean success = messageBrokerService.getProducerTemplate().requestBodyAndHeaders(
+ NotificationService.NOTIFICATION_QUEUE, notification, headers, Boolean.class);
+
+ if (!success) {
+ throw new WebApplicationException(BAD_REQUEST);
}
}
diff --git a/model/src/main/java/org/openremote/model/security/User.java b/model/src/main/java/org/openremote/model/security/User.java
index 3bc0c3acb..204be06d0 100644
--- a/model/src/main/java/org/openremote/model/security/User.java
+++ b/model/src/main/java/org/openremote/model/security/User.java
@@ -35,9 +35,10 @@ import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import java.lang.reflect.Field;
import java.time.Instant;
-import java.util.*;
-
-import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* This can be used (among other things) to query the USER_ENTITY table in JPA queries.
@@ -87,13 +88,6 @@ public class User {
@JsonIgnore
protected List<UserAttribute> attributes;
- public User(String id, String username, String firstName, String lastName) {
- this.id = id;
- this.username = username;
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
public User() {
}
diff --git a/test/src/main/resources/META-INF/services/org.openremote.manager.setup.SetupTasks b/test/src/test/resources/META-INF/services/org.openremote.manager.setup.SetupTasks
similarity index 100%
rename from test/src/main/resources/META-INF/services/org.openremote.manager.setup.SetupTasks
rename to test/src/test/resources/META-INF/services/org.openremote.manager.setup.SetupTasks
diff --git a/test/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider b/test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider
similarity index 100%
rename from test/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider
rename to test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider
diff --git a/test/src/main/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy b/test/src/test/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy
rename to test/src/test/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy
diff --git a/test/src/main/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy b/test/src/test/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy
rename to test/src/test/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy
diff --git a/test/src/main/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy b/test/src/test/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy
rename to test/src/test/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy
diff --git a/test/src/main/resources/org/openremote/test/failure/RulesFailureLoop.groovy b/test/src/test/resources/org/openremote/test/failure/RulesFailureLoop.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/failure/RulesFailureLoop.groovy
rename to test/src/test/resources/org/openremote/test/failure/RulesFailureLoop.groovy
diff --git a/test/src/main/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj b/test/src/test/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj
similarity index 100%
rename from test/src/main/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj
rename to test/src/test/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj
diff --git a/test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml b/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml
similarity index 100%
rename from test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml
rename to test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml
diff --git a/test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config.xml b/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml
similarity index 100%
rename from test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config.xml
rename to test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml
diff --git a/test/src/main/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp b/test/src/test/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp
similarity index 100%
rename from test/src/main/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp
rename to test/src/test/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca.key b/test/src/test/resources/org/openremote/test/provisioning/ca.key
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca.key
rename to test/src/test/resources/org/openremote/test/provisioning/ca.key
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_expired.pem b/test/src/test/resources/org/openremote/test/provisioning/ca_expired.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_expired.pem
rename to test/src/test/resources/org/openremote/test/provisioning/ca_expired.pem
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_expired.srl b/test/src/test/resources/org/openremote/test/provisioning/ca_expired.srl
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_expired.srl
rename to test/src/test/resources/org/openremote/test/provisioning/ca_expired.srl
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_forged.key b/test/src/test/resources/org/openremote/test/provisioning/ca_forged.key
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_forged.key
rename to test/src/test/resources/org/openremote/test/provisioning/ca_forged.key
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_forged.pem b/test/src/test/resources/org/openremote/test/provisioning/ca_forged.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_forged.pem
rename to test/src/test/resources/org/openremote/test/provisioning/ca_forged.pem
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_forged.srl b/test/src/test/resources/org/openremote/test/provisioning/ca_forged.srl
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_forged.srl
rename to test/src/test/resources/org/openremote/test/provisioning/ca_forged.srl
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_long.pem b/test/src/test/resources/org/openremote/test/provisioning/ca_long.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_long.pem
rename to test/src/test/resources/org/openremote/test/provisioning/ca_long.pem
diff --git a/test/src/main/resources/org/openremote/test/provisioning/ca_long.srl b/test/src/test/resources/org/openremote/test/provisioning/ca_long.srl
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/ca_long.srl
rename to test/src/test/resources/org/openremote/test/provisioning/ca_long.srl
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device1.csr b/test/src/test/resources/org/openremote/test/provisioning/device1.csr
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device1.csr
rename to test/src/test/resources/org/openremote/test/provisioning/device1.csr
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device1.key b/test/src/test/resources/org/openremote/test/provisioning/device1.key
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device1.key
rename to test/src/test/resources/org/openremote/test/provisioning/device1.key
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device1.pem b/test/src/test/resources/org/openremote/test/provisioning/device1.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device1.pem
rename to test/src/test/resources/org/openremote/test/provisioning/device1.pem
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device2.csr b/test/src/test/resources/org/openremote/test/provisioning/device2.csr
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device2.csr
rename to test/src/test/resources/org/openremote/test/provisioning/device2.csr
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device2.key b/test/src/test/resources/org/openremote/test/provisioning/device2.key
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device2.key
rename to test/src/test/resources/org/openremote/test/provisioning/device2.key
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device2_expired.pem b/test/src/test/resources/org/openremote/test/provisioning/device2_expired.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device2_expired.pem
rename to test/src/test/resources/org/openremote/test/provisioning/device2_expired.pem
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device3.csr b/test/src/test/resources/org/openremote/test/provisioning/device3.csr
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device3.csr
rename to test/src/test/resources/org/openremote/test/provisioning/device3.csr
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device3.key b/test/src/test/resources/org/openremote/test/provisioning/device3.key
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device3.key
rename to test/src/test/resources/org/openremote/test/provisioning/device3.key
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device3_caexpired.pem b/test/src/test/resources/org/openremote/test/provisioning/device3_caexpired.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device3_caexpired.pem
rename to test/src/test/resources/org/openremote/test/provisioning/device3_caexpired.pem
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device4.csr b/test/src/test/resources/org/openremote/test/provisioning/device4.csr
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device4.csr
rename to test/src/test/resources/org/openremote/test/provisioning/device4.csr
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device4.key b/test/src/test/resources/org/openremote/test/provisioning/device4.key
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device4.key
rename to test/src/test/resources/org/openremote/test/provisioning/device4.key
diff --git a/test/src/main/resources/org/openremote/test/provisioning/device4_forged.pem b/test/src/test/resources/org/openremote/test/provisioning/device4_forged.pem
similarity index 100%
rename from test/src/main/resources/org/openremote/test/provisioning/device4_forged.pem
rename to test/src/test/resources/org/openremote/test/provisioning/device4_forged.pem
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicBrokenRules.groovy b/test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicBrokenRules.groovy
rename to test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicFlowRules.json b/test/src/test/resources/org/openremote/test/rules/BasicFlowRules.json
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicFlowRules.json
rename to test/src/test/resources/org/openremote/test/rules/BasicFlowRules.json
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicJsonRules.json b/test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicJsonRules.json
rename to test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates.groovy
rename to test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy b/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy
rename to test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy
rename to test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy b/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy
rename to test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
rename to test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl b/test/src/test/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl
rename to test/src/test/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl
diff --git a/test/src/main/resources/org/openremote/test/rules/ConsoleLocation.groovy b/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ConsoleLocation.groovy
rename to test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/Geofence.json b/test/src/test/resources/org/openremote/test/rules/Geofence.json
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/Geofence.json
rename to test/src/test/resources/org/openremote/test/rules/Geofence.json
diff --git a/test/src/main/resources/org/openremote/test/rules/ResidenceAllLightsOff.js b/test/src/test/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
rename to test/src/test/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
diff --git a/test/src/main/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/ResidenceVacationMode.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
diff --git a/test/src/main/resources/org/openremote/test/rules/SmartCityCamera.groovy b/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy
similarity index 100%
rename from test/src/main/resources/org/openremote/test/rules/SmartCityCamera.groovy
rename to test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy