You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2024/06/05 02:15:56 UTC

(james-project) branch master updated: JAMES-3582 Drop unwired JPA message entities

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git


The following commit(s) were added to refs/heads/master by this push:
     new a637abe0aa JAMES-3582 Drop unwired JPA message entities
a637abe0aa is described below

commit a637abe0aac31278fa570f47ede5f989df41b06c
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Tue Jun 4 10:48:39 2024 +0200

    JAMES-3582 Drop unwired JPA message entities
---
 .../james/mailbox/jpa/mail/JPAMessageMapper.java   |   8 +-
 .../model/openjpa/JPAEncryptedMailboxMessage.java  | 112 ------------------
 .../model/openjpa/JPAStreamingMailboxMessage.java  | 125 ---------------------
 .../mailbox/jpa/openjpa/OpenJPAMessageFactory.java |  25 +----
 .../mailbox/jpa/openjpa/OpenJPAMessageManager.java |   2 +-
 .../src/main/resources/james-database.properties   |   9 --
 .../META-INF/org/apache/james/database.properties  |   1 -
 .../james-database-mariadb.properties              |   9 --
 .../sample-configuration/james-database.properties |   9 --
 .../james-database-mariadb.properties              |   9 --
 .../sample-configuration/james-database.properties |   9 --
 .../sample-configuration/james-database.properties |   9 --
 .../src/main/resources/james-database.properties   |   9 --
 src/site/xdoc/server/config-system.xml             |   3 -
 14 files changed, 3 insertions(+), 336 deletions(-)

diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
index 084bb2613f..a60e589607 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java
@@ -42,10 +42,8 @@ import org.apache.james.mailbox.jpa.mail.MessageUtils.MessageChangedFlags;
 import org.apache.james.mailbox.jpa.mail.model.JPAAttachment;
 import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessageWithAttachmentStorage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MailboxCounters;
 import org.apache.james.mailbox.model.MailboxId;
@@ -363,11 +361,7 @@ public class JPAMessageMapper extends JPATransactionalMapper implements MessageM
         MailboxMessage copy;
         JPAMailbox currentMailbox = JPAMailbox.from(mailbox);
 
-        if (original instanceof JPAStreamingMailboxMessage) {
-            copy = new JPAStreamingMailboxMessage(currentMailbox, uid, modSeq, original);
-        } else if (original instanceof JPAEncryptedMailboxMessage) {
-            copy = new JPAEncryptedMailboxMessage(currentMailbox, uid, modSeq, original);
-        } else if (original instanceof JPAMailboxMessageWithAttachmentStorage) {
+        if (original instanceof JPAMailboxMessageWithAttachmentStorage) {
             copy = new JPAMailboxMessageWithAttachmentStorage(currentMailbox, uid, modSeq, original);
         } else {
             copy = new JPAMailboxMessage(currentMailbox, uid, modSeq, original);
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java
deleted file mode 100644
index 4ce45f9df1..0000000000
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAEncryptedMailboxMessage.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.mailbox.jpa.mail.model.openjpa;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-
-import jakarta.mail.Flags;
-import jakarta.persistence.Basic;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Lob;
-import jakarta.persistence.Table;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.ModSeq;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.model.Content;
-import org.apache.james.mailbox.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.openjpa.persistence.Externalizer;
-import org.apache.openjpa.persistence.Factory;
-
-@Entity(name = "MailboxMessage")
-@Table(name = "JAMES_MAIL")
-public class JPAEncryptedMailboxMessage extends AbstractJPAMailboxMessage {
-
-        /** The value for the body field. Lazy loaded */
-        /** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */
-        @Basic(optional = false, fetch = FetchType.LAZY)
-        @Column(name = "MAIL_BYTES", length = 1048576000, nullable = false)
-        @Externalizer("EncryptDecryptHelper.getEncrypted")
-        @Factory("EncryptDecryptHelper.getDecrypted")
-        @Lob private byte[] body;
-
-
-        /** The value for the header field. Lazy loaded */
-        /** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */
-        @Basic(optional = false, fetch = FetchType.LAZY)
-        @Column(name = "HEADER_BYTES", length = 10485760, nullable = false)
-        @Externalizer("EncryptDecryptHelper.getEncrypted")
-        @Factory("EncryptDecryptHelper.getDecrypted")
-        @Lob private byte[] header;
-        
-        public JPAEncryptedMailboxMessage(JPAMailbox mailbox, Date internalDate, int size, Flags flags, Content content, int bodyStartOctet, PropertyBuilder propertyBuilder) throws MailboxException {
-            super(mailbox, internalDate, flags, size, bodyStartOctet, propertyBuilder);
-            try {
-                int headerEnd = bodyStartOctet;
-                if (headerEnd < 0) {
-                    headerEnd = 0;
-                }
-                InputStream stream = content.getInputStream();
-                this.header = IOUtils.toByteArray(new BoundedInputStream(stream, getBodyStartOctet()));
-                this.body = IOUtils.toByteArray(stream);
-
-            } catch (IOException e) {
-                throw new MailboxException("Unable to parse message",e);
-            }
-        }
-
-        /**
-         * Create a copy of the given message
-         */
-        public JPAEncryptedMailboxMessage(JPAMailbox mailbox, MessageUid uid, ModSeq modSeq, MailboxMessage message) throws MailboxException {
-            super(mailbox, uid, modSeq, message);
-            try {
-                this.body = IOUtils.toByteArray(message.getBodyContent());
-                this.header = IOUtils.toByteArray(message.getHeaderContent());
-            } catch (IOException e) {
-                throw new MailboxException("Unable to parse message",e);
-            }
-        }
-
-
-        @Override
-        public InputStream getBodyContent() throws IOException {
-            return new ByteArrayInputStream(body);
-        }
-
-        @Override
-        public InputStream getHeaderContent() throws IOException {
-            return new ByteArrayInputStream(header);
-        }
-
-        @Override
-        public MailboxMessage copy(Mailbox mailbox) throws MailboxException {
-            return new JPAEncryptedMailboxMessage(JPAMailbox.from(mailbox), getUid(), getModSeq(), this);
-        }
-}
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java
deleted file mode 100644
index 355cbecb46..0000000000
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMessage.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.mailbox.jpa.mail.model.openjpa;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-
-import jakarta.mail.Flags;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Table;
-
-import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.james.mailbox.MessageUid;
-import org.apache.james.mailbox.ModSeq;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
-import org.apache.james.mailbox.model.Content;
-import org.apache.james.mailbox.model.Mailbox;
-import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
-import org.apache.openjpa.persistence.Persistent;
-
-/**
- * JPA implementation of {@link AbstractJPAMailboxMessage} which use openjpas {@link Persistent} type to
- * be able to stream the message content without loading it into the memory at all. 
- * 
- * This is not supported for all DB's yet. See <a href="http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html">Additional JPA Mappings</a>
- * 
- * If your DB is not supported by this, use {@link JPAMailboxMessage}
- *
- * TODO: Fix me!
- */
-@Entity(name = "MailboxMessage")
-@Table(name = "JAMES_MAIL")
-public class JPAStreamingMailboxMessage extends AbstractJPAMailboxMessage {
-
-    @Persistent(optional = false, fetch = FetchType.LAZY)
-    @Column(name = "MAIL_BYTES", length = 1048576000, nullable = false)
-    private InputStream body;
-
-    @Persistent(optional = false, fetch = FetchType.LAZY)
-    @Column(name = "HEADER_BYTES", length = 10485760, nullable = false)
-    private InputStream header;
-
-    private final Content content;
-
-    public JPAStreamingMailboxMessage(JPAMailbox mailbox, Date internalDate, int size, Flags flags, Content content, int bodyStartOctet, PropertyBuilder propertyBuilder) throws MailboxException {
-        super(mailbox, internalDate, flags, size, bodyStartOctet, propertyBuilder);
-        this.content = content;
-
-        try {
-            this.header = new BoundedInputStream(content.getInputStream(), getBodyStartOctet());
-            InputStream bodyStream = content.getInputStream();
-            bodyStream.skip(getBodyStartOctet());
-            this.body = bodyStream;
-
-        } catch (IOException e) {
-            throw new MailboxException("Unable to parse message",e);
-        }
-    }
-
-    /**
-     * Create a copy of the given message
-     */
-    public JPAStreamingMailboxMessage(JPAMailbox mailbox, MessageUid uid, ModSeq modSeq, MailboxMessage message) throws MailboxException {
-        super(mailbox, uid, modSeq, message);
-        this.content = new Content() {
-            @Override
-            public InputStream getInputStream() throws IOException {
-                return message.getFullContent();
-            }
-
-            @Override
-            public long size() {
-                return message.getFullContentOctets();
-            }
-        };
-        try {
-            this.header = getHeaderContent();
-            this.body = getBodyContent();
-        } catch (IOException e) {
-            throw new MailboxException("Unable to parse message",e);
-        }
-    }
-
-    @Override
-    public InputStream getBodyContent() throws IOException {
-        InputStream inputStream = content.getInputStream();
-        inputStream.skip(getBodyStartOctet());
-        return inputStream;
-    }
-
-    @Override
-    public InputStream getHeaderContent() throws IOException {
-        int headerEnd = getBodyStartOctet() - 2;
-        if (headerEnd < 0) {
-            headerEnd = 0;
-        }
-        return new BoundedInputStream(content.getInputStream(), headerEnd);
-    }
-
-    @Override
-    public MailboxMessage copy(Mailbox mailbox) throws MailboxException {
-        return new JPAStreamingMailboxMessage(JPAMailbox.from(mailbox), getUid(), getModSeq(), this);
-    }
-}
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageFactory.java
index 81675ba160..46680feae7 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageFactory.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageFactory.java
@@ -27,9 +27,7 @@ import jakarta.mail.Flags;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMailboxMessage;
 import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage;
-import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMessage;
 import org.apache.james.mailbox.model.Content;
 import org.apache.james.mailbox.model.Mailbox;
 import org.apache.james.mailbox.model.MessageAttachmentMetadata;
@@ -39,29 +37,8 @@ import org.apache.james.mailbox.store.MessageFactory;
 import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
 
 public class OpenJPAMessageFactory implements MessageFactory<AbstractJPAMailboxMessage> {
-    private final AdvancedFeature feature;
-
-    public OpenJPAMessageFactory(AdvancedFeature feature) {
-        this.feature = feature;
-    }
-
-    public enum AdvancedFeature {
-        None,
-        Streaming,
-        Encryption
-    }
-
     @Override
     public AbstractJPAMailboxMessage createMessage(MessageId messageId, ThreadId threadId, Mailbox mailbox, Date internalDate, Date saveDate, int size, int bodyStartOctet, Content content, Flags flags, PropertyBuilder propertyBuilder, List<MessageAttachmentMetadata> attachments) throws MailboxException {
-        switch (feature) {
-            case Streaming:
-                return new JPAStreamingMailboxMessage(JPAMailbox.from(mailbox), internalDate, size, flags, content,
-                    bodyStartOctet, propertyBuilder);
-            case Encryption:
-                return new JPAEncryptedMailboxMessage(JPAMailbox.from(mailbox), internalDate, size, flags, content,
-                    bodyStartOctet, propertyBuilder);
-            default:
-                return new JPAMailboxMessage(JPAMailbox.from(mailbox), internalDate, size, flags, content,  bodyStartOctet,  propertyBuilder);
-        }
+        return new JPAMailboxMessage(JPAMailbox.from(mailbox), internalDate, size, flags, content,  bodyStartOctet,  propertyBuilder);
     }
 }
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
index 1ef4dcd729..f9ac11e7e6 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
@@ -66,7 +66,7 @@ public class OpenJPAMessageManager extends StoreMessageManager {
                                  Clock clock) {
         super(StoreMailboxManager.DEFAULT_NO_MESSAGE_CAPABILITIES, mapperFactory, index, eventBus, locker, mailbox,
             quotaManager, quotaRootResolver, batchSizes, storeRightManager, PreDeletionHooks.NO_PRE_DELETION_HOOK,
-            new MessageStorer.WithoutAttachment(mapperFactory, messageIdFactory, new OpenJPAMessageFactory(OpenJPAMessageFactory.AdvancedFeature.None), threadIdGuessingAlgorithm, clock));
+            new MessageStorer.WithoutAttachment(mapperFactory, messageIdFactory, new OpenJPAMessageFactory(), threadIdGuessingAlgorithm, clock));
         this.storeRightManager = storeRightManager;
         this.mapperFactory = mapperFactory;
         this.mailbox = mailbox;
diff --git a/mailbox/jpa/src/main/resources/james-database.properties b/mailbox/jpa/src/main/resources/james-database.properties
index eededeb9e3..93ba6aa0f9 100644
--- a/mailbox/jpa/src/main/resources/james-database.properties
+++ b/mailbox/jpa/src/main/resources/james-database.properties
@@ -26,15 +26,6 @@ database.url=jdbc:derby:../var/store/derby;create=true
 database.username=app
 database.password=app
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties b/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties
index 566530c6f8..a852652c46 100644
--- a/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties
+++ b/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties
@@ -22,4 +22,3 @@ database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
 database.url=jdbc:derby:target/var/store/derby;create=true
 database.username=app
 database.password=app
-openjpa.streaming=false
diff --git a/server/apps/jpa-app/sample-configuration/james-database-mariadb.properties b/server/apps/jpa-app/sample-configuration/james-database-mariadb.properties
index 9b5afa0be2..e353bc4e6d 100644
--- a/server/apps/jpa-app/sample-configuration/james-database-mariadb.properties
+++ b/server/apps/jpa-app/sample-configuration/james-database-mariadb.properties
@@ -26,15 +26,6 @@ database.url=jdbc:mariadb://mariadb/test
 database.username=test
 database.password=test
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/server/apps/jpa-app/sample-configuration/james-database.properties b/server/apps/jpa-app/sample-configuration/james-database.properties
index e0d6a6ea8b..22f2871d1e 100644
--- a/server/apps/jpa-app/sample-configuration/james-database.properties
+++ b/server/apps/jpa-app/sample-configuration/james-database.properties
@@ -26,15 +26,6 @@ database.url=jdbc:derby:../var/store/derby;create=true
 database.username=app
 database.password=app
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties b/server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties
index 9b5afa0be2..e353bc4e6d 100644
--- a/server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties
+++ b/server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties
@@ -26,15 +26,6 @@ database.url=jdbc:mariadb://mariadb/test
 database.username=test
 database.password=test
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/server/apps/jpa-smtp-app/sample-configuration/james-database.properties b/server/apps/jpa-smtp-app/sample-configuration/james-database.properties
index e0d6a6ea8b..22f2871d1e 100644
--- a/server/apps/jpa-smtp-app/sample-configuration/james-database.properties
+++ b/server/apps/jpa-smtp-app/sample-configuration/james-database.properties
@@ -26,15 +26,6 @@ database.url=jdbc:derby:../var/store/derby;create=true
 database.username=app
 database.password=app
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/server/apps/scaling-pulsar-smtp/sample-configuration/james-database.properties b/server/apps/scaling-pulsar-smtp/sample-configuration/james-database.properties
index cf0c1fa3f6..81427a5ba4 100644
--- a/server/apps/scaling-pulsar-smtp/sample-configuration/james-database.properties
+++ b/server/apps/scaling-pulsar-smtp/sample-configuration/james-database.properties
@@ -29,15 +29,6 @@ database.username=${env:DATABASE_USERNAME}
 #database.password=password
 database.password=${env:DATABASE_PASSWORD}
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/server/apps/spring-app/src/main/resources/james-database.properties b/server/apps/spring-app/src/main/resources/james-database.properties
index f7c9084c07..bc90988643 100644
--- a/server/apps/spring-app/src/main/resources/james-database.properties
+++ b/server/apps/spring-app/src/main/resources/james-database.properties
@@ -26,15 +26,6 @@ database.url=jdbc:derby:../var/store/derby;create=true
 database.username=app
 database.password=app
 
-# Use streaming for Blobs
-# This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable
-# it. 
-# 
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  #7.11.  LOB Streaming 
-# 
-openjpa.streaming=false
-
 # Validate the data source before using it
 # datasource.testOnBorrow=true
 # datasource.validationQueryTimeoutSec=2
diff --git a/src/site/xdoc/server/config-system.xml b/src/site/xdoc/server/config-system.xml
index d969239e31..6f53129ea9 100644
--- a/src/site/xdoc/server/config-system.xml
+++ b/src/site/xdoc/server/config-system.xml
@@ -82,9 +82,6 @@
                     <dd>The user id of the database account to be used by this connection.</dd>
                     <dt><strong>database.password</strong></dt>
                     <dd>The password of the database account to be used by this connection.</dd>
-                    <dt><strong>openjpa.streaming</strong></dt>
-                    <dd>true or false - Use streaming for Blobs. This is only supported on a limited set of databases atm. You
-                        should check if it's supported by your DB before enable it. See <a href="http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html">http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html</a> (#7.11. LOB Streaming).</dd>
                 </dl>
 
                 <p>NOTE: all<code>openjpa.*</code> properties will be passed to OpenJPA library as configuration See <a href="https://openjpa.apache.org/builds/3.2.2/apache-openjpa/docs/ref_guide_conf_openjpa.html">https://openjpa.apache.org/builds/3.2.2/apache-openjpa/docs/ref_guide_conf_openjpa.html</a> for a complete list </p>


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org