You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/11/10 09:53:43 UTC
[isis] branch master updated: ISIS-2891: aligin zip module package
names
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 456874d ISIS-2891: aligin zip module package names
456874d is described below
commit 456874d3d0107f5667a1bd63d7fc3f9a56fa3bd5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 10 10:53:34 2021 +0100
ISIS-2891: aligin zip module package names
- properly register components
- split ZipService into interface and impl.
---
.../applib/IsisModuleSubdomainsDocxApplib.java | 2 +-
.../{services => service}/DocxServiceDefault.java | 4 +--
.../docx/applib/DocxService_merge_Test.java | 2 +-
.../applib/IsisModuleSubdomainsOgnlApplib.java | 2 --
.../zip/applib}/IsisModuleExtZip.java | 10 ++++--
.../isis/subdomains/zip/applib/ZipService.java | 41 +++++++++++++++++++++
.../zip/applib/service/ZipServiceDefault.java} | 42 ++++++++--------------
7 files changed, 66 insertions(+), 37 deletions(-)
diff --git a/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java
index d12d16d..48af6c4 100644
--- a/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java
+++ b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubdomainsDocxApplib.java
@@ -21,7 +21,7 @@ package org.apache.isis.subdomains.docx.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.subdomains.docx.applib.services.DocxServiceDefault;
+import org.apache.isis.subdomains.docx.applib.service.DocxServiceDefault;
@Configuration
@Import({
diff --git a/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/services/DocxServiceDefault.java b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/service/DocxServiceDefault.java
similarity index 99%
rename from subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/services/DocxServiceDefault.java
rename to subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/service/DocxServiceDefault.java
index dd3fda8..a232ff3 100644
--- a/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/services/DocxServiceDefault.java
+++ b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/service/DocxServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.subdomains.docx.applib.services;
+package org.apache.isis.subdomains.docx.applib.service;
import java.io.File;
import java.io.FileInputStream;
@@ -69,7 +69,7 @@ import org.apache.isis.subdomains.docx.applib.util.Types;
import lombok.val;
@Service
-@Named("isis.sub.docx.ClockService")
+@Named("isis.sub.docx.DocxServiceDefault")
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
public class DocxServiceDefault implements DocxService {
diff --git a/subdomains/docx/applib/src/test/java/org/apache/isis/subdomains/docx/applib/DocxService_merge_Test.java b/subdomains/docx/applib/src/test/java/org/apache/isis/subdomains/docx/applib/DocxService_merge_Test.java
index 1f51a8e..fbbb9e4 100644
--- a/subdomains/docx/applib/src/test/java/org/apache/isis/subdomains/docx/applib/DocxService_merge_Test.java
+++ b/subdomains/docx/applib/src/test/java/org/apache/isis/subdomains/docx/applib/DocxService_merge_Test.java
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assumptions.assumeThat;
import org.apache.isis.subdomains.docx.applib.exceptions.LoadInputException;
import org.apache.isis.subdomains.docx.applib.exceptions.MergeException;
-import org.apache.isis.subdomains.docx.applib.services.DocxServiceDefault;
+import org.apache.isis.subdomains.docx.applib.service.DocxServiceDefault;
import lombok.val;
diff --git a/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
index 3b04652..90e3136 100644
--- a/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
+++ b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubdomainsOgnlApplib.java
@@ -18,11 +18,9 @@
*/
package org.apache.isis.subdomains.ognl.applib;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
-@ComponentScan
public class IsisModuleSubdomainsOgnlApplib {
}
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/IsisModuleExtZip.java
similarity index 81%
rename from subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
rename to subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/IsisModuleExtZip.java
index 0b9a492..85df36a 100644
--- a/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
+++ b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/IsisModuleExtZip.java
@@ -16,13 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.zip.dom;
+package org.apache.isis.subdomains.zip.applib;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import org.apache.isis.subdomains.zip.applib.service.ZipServiceDefault;
@Configuration
-@ComponentScan
+@Import({
+ ZipServiceDefault.class
+})
public class IsisModuleExtZip {
}
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/ZipService.java b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/ZipService.java
new file mode 100644
index 0000000..d963b93
--- /dev/null
+++ b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/ZipService.java
@@ -0,0 +1,41 @@
+package org.apache.isis.subdomains.zip.applib;
+
+import java.io.File;
+import java.util.List;
+
+import lombok.Data;
+
+public interface ZipService {
+
+ /**
+ * Rather than use the name of the file (which might be temporary files, for example)
+ * we explicitly provide the name to use (in the ZipEntry).
+ */
+ byte[] zipNamedFiles(List<FileAndName> fileAndNameList);
+
+ /**
+ * As per {@link #zipNamedFiles(List)},
+ * but using each file's name as the zip entry (rather than providing it).
+ */
+ byte[] zipFiles(List<File> fileList);
+
+ /**
+ * Similar to {@link #zipNamedFiles(List)}, but uses simple byte[] as the input, rather than files.
+ *
+ * @param bytesAndNameList
+ */
+ byte[] zipNamedBytes(List<BytesAndName> bytesAndNameList);
+
+ @Data
+ public static class FileAndName {
+ private final String name;
+ private final File file;
+ }
+
+ @Data
+ public static class BytesAndName {
+ private final String name;
+ private final byte[] bytes;
+ }
+
+}
\ No newline at end of file
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/service/ZipServiceDefault.java
similarity index 78%
rename from subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
rename to subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/service/ZipServiceDefault.java
index ef554c0..47ccd0a 100644
--- a/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
+++ b/subdomains/zip/applib/src/main/java/org/apache/isis/subdomains/zip/applib/service/ZipServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.zip.dom.impl;
+package org.apache.isis.subdomains.zip.applib.service;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -27,27 +27,26 @@ import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import javax.annotation.Priority;
+import javax.inject.Named;
+
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.exceptions.UnrecoverableException;
import org.apache.isis.commons.internal.base._Bytes;
+import org.apache.isis.subdomains.zip.applib.ZipService;
-import lombok.Data;
import lombok.val;
@Service
-public class ZipService {
-
- @Data
- public static class FileAndName {
- private final String name;
- private final File file;
- }
+@Named("isis.sub.zip.ZipServiceDefault")
+@Priority(PriorityPrecedence.MIDPOINT)
+@Qualifier("Default")
+public class ZipServiceDefault implements ZipService {
- /**
- * Rather than use the name of the file (which might be temporary files, for example)
- * we explicitly provide the name to use (in the ZipEntry).
- */
+ @Override
public byte[] zipNamedFiles(final List<FileAndName> fileAndNameList) {
try {
@@ -70,10 +69,7 @@ public class ZipService {
}
}
- /**
- * As per {@link #zipNamedFiles(List)},
- * but using each file's name as the zip entry (rather than providing it).
- */
+ @Override
public byte[] zipFiles(final List<File> fileList) {
return zipNamedFiles(fileList.stream()
.map(file -> new FileAndName(file.getName(), file))
@@ -81,17 +77,7 @@ public class ZipService {
);
}
- @Data
- public static class BytesAndName {
- private final String name;
- private final byte[] bytes;
- }
-
- /**
- * Similar to {@link #zipNamedFiles(List)}, but uses simple byte[] as the input, rather than files.
- *
- * @param bytesAndNameList
- */
+ @Override
public byte[] zipNamedBytes(final List<BytesAndName> bytesAndNameList) {
final byte[] bytes;