You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/07/07 21:58:52 UTC
[archiva] branch master updated (dcf4c11 -> 71b8409)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from dcf4c11 Adapting to redback LDAP group mapping change
new 21f02d4 Fixing closable stream
new 71b8409 Fixing jackson initalization
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/archiva/repository/storage/util/StorageUtil.java | 3 ++-
.../rest/services/interceptors/JacksonJsonConfigurator.java | 7 +++++++
.../src/main/resources/META-INF/spring-context.xml | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
[archiva] 01/02: Fixing closable stream
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 21f02d4e81438b97d13966fb22f825b2249aa8af
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue Jul 7 23:57:59 2020 +0200
Fixing closable stream
---
.../java/org/apache/archiva/repository/storage/util/StorageUtil.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java b/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java
index fa637c6..bd52e4b 100644
--- a/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java
+++ b/archiva-modules/archiva-base/archiva-storage-api/src/main/java/org/apache/archiva/repository/storage/util/StorageUtil.java
@@ -90,7 +90,8 @@ public class StorageUtil
*/
public static Stream<StorageAsset> newAssetStream( StorageAsset start, boolean parallel )
{
- return StreamSupport.stream( new AssetSpliterator( start ), parallel );
+ final AssetSpliterator spliterator = new AssetSpliterator( start );
+ return StreamSupport.stream( spliterator, parallel ).onClose( ( ) -> spliterator.close( ) );
}
[archiva] 02/02: Fixing jackson initalization
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 71b8409b5ddc9d941336c56cd8727d5bcf5415d9
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue Jul 7 23:58:42 2020 +0200
Fixing jackson initalization
---
.../rest/services/interceptors/JacksonJsonConfigurator.java | 7 +++++++
.../src/main/resources/META-INF/spring-context.xml | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
index aaca917..22937ac 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
@@ -22,12 +22,15 @@ package org.apache.archiva.rest.services.interceptors;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
import javax.inject.Named;
+import java.text.SimpleDateFormat;
/**
* class to setup Jackson Json configuration
@@ -47,6 +50,10 @@ public class JacksonJsonConfigurator
log.info( "configure jackson ObjectMapper" );
objectMapper.disable( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ objectMapper.setAnnotationIntrospector( new JaxbAnnotationIntrospector( objectMapper.getTypeFactory() ) );
+ objectMapper.registerModule( new JavaTimeModule( ) );
+ objectMapper.setDateFormat( new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSSZ" ) );
+
xmlMapper.disable( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES );
}
}
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index a7ace51..7d1f847 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -51,7 +51,7 @@
<bean id="redbackJacksonXMLMapper" class="com.fasterxml.jackson.dataformat.xml.XmlMapper" />
- <jaxrs:server id="archivaServices" address="/archivaServices" >
+ <jaxrs:server name="archivaServices" address="/archivaServices" >
<jaxrs:providers>
<ref bean="jsonProvider" />