Merge branch 'release/5.0.1'

Author: msqr

solarnet-db-setup/postgres/postgres-init-common.sql

@@ -1,3 +1,11 @@
+/**
+ * "Natural sort" collation, to sort text with atomic number components and upper case
+ * before lower case, to match Java standard sorting.
+ *
+ * @see https://www.postgresql.org/docs/17/collation.html#ICU-COLLATION-SETTINGS
+ */
+CREATE COLLATION solarcommon.naturalsort (provider = icu, locale = 'und-u-kf-upper-kn');
+
 /**
  * Reduce a 2d array into a set of 1d arrays.
  */

solarnet-db-setup/postgres/postgres-init-datm-core.sql

@@ -2,7 +2,7 @@
 CREATE TABLE solardatm.da_datm_meta (
 	stream_id	UUID NOT NULL DEFAULT uuid_generate_v4(),
 	node_id		BIGINT NOT NULL,
-	source_id	CHARACTER VARYING(64) NOT NULL,
+	source_id	CHARACTER VARYING(64) NOT NULL COLLATE solarcommon.naturalsort,
 	created		TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	updated		TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	names_i		TEXT[],
@@ -17,7 +17,7 @@ CREATE TABLE solardatm.da_datm_meta (
 CREATE TABLE solardatm.da_loc_datm_meta (
 	stream_id	UUID NOT NULL DEFAULT uuid_generate_v4(),
 	loc_id		BIGINT NOT NULL,
-	source_id	CHARACTER VARYING(64) NOT NULL,
+	source_id	CHARACTER VARYING(64) NOT NULL COLLATE solarcommon.naturalsort,
 	created		TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	updated		TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	names_i		TEXT[],

solarnet-db-setup/postgres/updates/NET-492-natural-sort-source-ids.txt

@@ -0,0 +1,5 @@
+-- see https://www.postgresql.org/docs/17/collation.html#ICU-COLLATION-SETTINGS
+CREATE COLLATION solarcommon.naturalsort (provider = icu, locale = 'und-u-kf-upper-kn');
+
+ALTER TABLE solardatm.da_datm_meta ALTER COLUMN source_id TYPE CHARACTER VARYING(64) COLLATE solarcommon.naturalsort;
+ALTER TABLE solardatm.da_loc_datm_meta ALTER COLUMN source_id TYPE CHARACTER VARYING(64) COLLATE solarcommon.naturalsort;

solarnet/cloud-integrations/build.gradle

@@ -14,7 +14,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Cloud Integrations'
-version = '3.0.0'
+version = '3.0.1'
 
 base {
 	archivesName = 'solarnet-cloud-integrations'

solarnet/cloud-integrations/src/main/java/net/solarnetwork/central/c2c/biz/impl/SolcastIrradianceCloudDatumStreamService.java

@@ -84,7 +84,7 @@
  * irradiance API.
  *
  * @author matt
- * @version 2.0
+ * @version 2.1
  */
 public class SolcastIrradianceCloudDatumStreamService extends BaseSolcastCloudDatumStreamService {
 
@@ -300,6 +300,10 @@ private Collection<GeneralDatum> executeRequest(CloudDatumStreamConfiguration da
 			CloudIntegrationConfiguration integration, final String latitude, final String longitude,
 			final Duration resolution, final Map<String, ValueRef> refsByFieldName, Instant startDate,
 			Instant endDate, final boolean useLiveApi, final Instant now) {
+		if ( !endDate.isAfter(startDate) ) {
+			// sometimes happens from split between historic/live
+			return List.of();
+		}
 		// @formatter:off
 		final UriComponentsBuilder uriBuilder = UriComponentsBuilder
 				.fromUri(resolveBaseUrl(integration, SolcastCloudIntegrationService.BASE_URI))

solarnet/common-web/build.gradle

@@ -16,7 +16,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Common Web'
-version = '3.0.0'
+version = '3.1.0'
 
 base {
 	archivesName = 'solarnet-common-web'

solarnet/common-web/src/main/java/net/solarnetwork/central/web/support/WebServiceGlobalControllerSupport.java

@@ -44,6 +44,7 @@
 import org.springframework.dao.TransientDataAccessResourceException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageConversionException;
+import org.springframework.http.converter.HttpMessageNotWritableException;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.AuthenticationException;
@@ -70,7 +71,7 @@
  * Global REST controller support.
  *
  * @author matt
- * @version 1.11
+ * @version 1.12
  */
 @RestControllerAdvice
 @Order(1000)
@@ -497,6 +498,40 @@ public Result<?> handleHttpMessageConversionException(HttpMessageConversionExcep
 		return error("WEB.00200", e.getMessage());
 	}
 
+	/**
+	 * Handle a {@link HttpMessageNotWritableException}.
+	 *
+	 * <p>
+	 * This exception implies a response cannot be written, so just log a
+	 * message.
+	 * </p>
+	 *
+	 * @param e
+	 *        the exception
+	 * @param request
+	 *        the request
+	 * @since 1.12
+	 */
+	@ExceptionHandler(HttpMessageNotWritableException.class)
+	public void handleHttpMessageNotWritableException(HttpMessageNotWritableException e,
+			WebRequest request) {
+		Throwable cause = e;
+		while ( cause.getCause() != null ) {
+			cause = cause.getCause();
+			if ( "org.apache.catalina.connector.ClientAbortException"
+					.equals(cause.getClass().getName()) ) {
+				log.debug("ClientAbortException in request {}", requestDescription(request), e);
+				return;
+			} else if ( cause instanceof IOException ) {
+				log.debug("IOException in request {}", requestDescription(request), e);
+				return;
+			}
+		}
+
+		log.warn("HttpMessageNotWritableException in request {}; user [{}]", requestDescription(request),
+				userPrincipalName(request), e);
+	}
+
 	/**
 	 * Handle a {@link ClientAbortException}.
 	 *

solarnet/datum/build.gradle

@@ -16,7 +16,7 @@ dependencyManagement {
 }
 
 description = 'SolarNet: Datum'
-version = '5.0.0'
+version = '5.1.0'
 
 base {
 	archivesName = 'solarnet-datum'

solarnet/datum/src/main/java/net/solarnetwork/central/datum/v2/domain/BasicDatumStreamMetadata.java

@@ -25,6 +25,7 @@
 import static net.solarnetwork.util.ObjectUtils.requireNonNullArgument;
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Objects;
 import java.util.UUID;
 import net.solarnetwork.domain.datum.DatumSamplesType;
 import net.solarnetwork.domain.datum.DatumStreamMetadata;
@@ -33,7 +34,7 @@
  * Implementation of {@link DatumStreamMetadata}.
  *
  * @author matt
- * @version 2.0
+ * @version 2.1
  * @since 2.8
  */
 public class BasicDatumStreamMetadata implements DatumStreamMetadata, Serializable {
@@ -112,6 +113,31 @@ public BasicDatumStreamMetadata(UUID streamId, String timeZoneId, Object instant
 				(String[]) statusProperties);
 	}
 
+	@Override
+	public int hashCode() {
+		return Objects.hash(streamId);
+	}
+
+	/**
+	 * Compare for equality.
+	 *
+	 * <p>
+	 * Only the {@code streamId} is considered.
+	 * </p>
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if ( this == obj ) {
+			return true;
+		}
+		if ( !(obj instanceof BasicDatumStreamMetadata other) ) {
+			return false;
+		}
+		return Objects.equals(streamId, other.streamId);
+	}
+
 	@Override
 	public UUID getStreamId() {
 		return streamId;

solarnet/datum/src/main/java/net/solarnetwork/central/datum/v2/domain/BasicObjectDatumStreamMetadata.java

@@ -25,6 +25,7 @@
 import static net.solarnetwork.util.ObjectUtils.requireNonNullArgument;
 import java.io.Serial;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.UUID;
 import net.solarnetwork.central.domain.ObjectDatumIdRelated;
 import net.solarnetwork.domain.BasicLocation;
@@ -36,7 +37,7 @@
  * Basic implementation of {@link ObjectDatumStreamMetadata}.
  *
  * @author matt
- * @version 1.1
+ * @version 1.2
  * @since 2.8
  */
 public class BasicObjectDatumStreamMetadata extends BasicDatumStreamMetadata
@@ -190,6 +191,37 @@ public BasicObjectDatumStreamMetadata(UUID streamId, String timeZoneId, ObjectDa
 		this.metaJson = metaJson;
 	}
 
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + Objects.hash(kind);
+		return result;
+	}
+
+	/**
+	 * Compare for equality.
+	 *
+	 * <p>
+	 * Only the {@code kind} and {@code streamId} are considered.
+	 * </p>
+	 *
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if ( this == obj ) {
+			return true;
+		}
+		if ( !super.equals(obj) ) {
+			return false;
+		}
+		if ( !(obj instanceof BasicObjectDatumStreamMetadata other) ) {
+			return false;
+		}
+		return kind == other.kind;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();