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 2020/07/31 19:41:50 UTC

[isis] branch master updated (3124dc3 -> 96778f6)

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

ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 3124dc3  ISIS-2407: CORS to only filter resteasy
     new b5d6753  ISIS-2407: use ViewModel nature for demo items
     new 96778f6  ISIS-2407: fixes bulk select/toggle (UrlEncodingServiceNaiveInMemory)

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:
 .../isis/core/commons/internal/hash/_Hashes.java   | 92 ++++++++++++++++++++++
 ...ObjectFacetDeclarativeInitializingAbstract.java |  2 +-
 .../UrlEncodingServiceNaiveInMemory.java           | 85 +++++++++++++++++---
 .../java/demoapp/dom/actions/assoc/DemoItem.java   |  2 +-
 .../java/demoapp/dom/actions/async/DemoTask.java   |  2 +-
 .../java/demoapp/dom/actions/depargs/DemoItem.java |  2 +-
 .../src/main/java/demoapp/dom/mixins/DemoItem.java |  2 +-
 .../cors/impl/IsisModuleExtCorsImpl.java           | 16 +++-
 8 files changed, 187 insertions(+), 16 deletions(-)
 create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java


[isis] 01/02: ISIS-2407: use ViewModel nature for demo items

Posted by ah...@apache.org.
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

commit b5d675353360aacc1f4e187eeafe8491c858b362
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jul 31 21:36:26 2020 +0200

    ISIS-2407: use ViewModel nature for demo items
---
 .../main/java/demoapp/dom/actions/assoc/DemoItem.java    |  2 +-
 .../main/java/demoapp/dom/actions/async/DemoTask.java    |  2 +-
 .../main/java/demoapp/dom/actions/depargs/DemoItem.java  |  2 +-
 .../src/main/java/demoapp/dom/mixins/DemoItem.java       |  2 +-
 .../isis/extensions/cors/impl/IsisModuleExtCorsImpl.java | 16 +++++++++++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/actions/assoc/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/actions/assoc/DemoItem.java
index e770f1f..b782ac9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/actions/assoc/DemoItem.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/actions/assoc/DemoItem.java
@@ -32,7 +32,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 
-@DomainObject(nature=Nature.INMEMORY_ENTITY, objectType = "demo.AssociatedActionDemoTask")
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.AssociatedActionDemoTask")
 @Named("assoc.DemoItem")
 @NoArgsConstructor 
 @AllArgsConstructor(staticName="of")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/actions/async/DemoTask.java b/examples/demo/domain/src/main/java/demoapp/dom/actions/async/DemoTask.java
index 7df0b2a..35082bd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/actions/async/DemoTask.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/actions/async/DemoTask.java
@@ -29,7 +29,7 @@ import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
 
 import lombok.RequiredArgsConstructor;
 
-@DomainObject(nature=Nature.INMEMORY_ENTITY, objectType = "demo.AsyncDemoTask", editing=Editing.DISABLED) 
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.AsyncDemoTask", editing=Editing.DISABLED) 
 @RequiredArgsConstructor(staticName="of")
 public class DemoTask implements SseSource {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/actions/depargs/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/actions/depargs/DemoItem.java
index a4a62fc..8ad5033 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/actions/depargs/DemoItem.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/actions/depargs/DemoItem.java
@@ -32,7 +32,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-@DomainObject(nature=Nature.INMEMORY_ENTITY, objectType = "demo.DependentArgsDemoItem")
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.DependentArgsDemoItem")
 @Named("depargs.DemoItem")
 @NoArgsConstructor 
 @AllArgsConstructor(staticName="of")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/mixins/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/mixins/DemoItem.java
index beaf7d4..4ab52ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/mixins/DemoItem.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/mixins/DemoItem.java
@@ -30,7 +30,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 
-@DomainObject(nature=Nature.INMEMORY_ENTITY, objectType = "demo.MixinDemoItem")
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.MixinDemoItem")
 @NoArgsConstructor 
 @AllArgsConstructor(staticName="of")
 public class DemoItem {
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
index ea489b9..b254017 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
@@ -18,10 +18,15 @@
  */
 package org.apache.isis.extensions.cors.impl;
 
+import java.io.IOException;
 import java.util.Collections;
 
 import javax.inject.Named;
 import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -67,7 +72,16 @@ public class IsisModuleExtCorsImpl {
     }
 	
 	public CorsFilter corsFilter() {
-		return new CorsFilter(corsConfigurationSource());
+		return new CorsFilter(corsConfigurationSource()) {
+		    @Override
+		    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+		            FilterChain filterChain) throws ServletException, IOException {
+		        
+		        log.info("request {}", request.getRequestURL());
+		        
+		        super.doFilterInternal(request, response, filterChain);
+		    }
+		};
 	}
 	
 	private CorsConfigurationSource corsConfigurationSource() {


[isis] 02/02: ISIS-2407: fixes bulk select/toggle (UrlEncodingServiceNaiveInMemory)

Posted by ah...@apache.org.
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

commit 96778f601a4c9c6b0715c5efcd01dec032cd864e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jul 31 21:40:35 2020 +0200

    ISIS-2407: fixes bulk select/toggle (UrlEncodingServiceNaiveInMemory)
---
 .../isis/core/commons/internal/hash/_Hashes.java   | 92 ++++++++++++++++++++++
 ...ObjectFacetDeclarativeInitializingAbstract.java |  2 +-
 .../UrlEncodingServiceNaiveInMemory.java           | 85 +++++++++++++++++---
 3 files changed, 168 insertions(+), 11 deletions(-)

diff --git a/core/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java b/core/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java
new file mode 100644
index 0000000..5b380ba
--- /dev/null
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/hash/_Hashes.java
@@ -0,0 +1,92 @@
+/*
+ *  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.isis.core.commons.internal.hash;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
+import org.apache.isis.core.commons.internal.base._NullSafe;
+
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+/**
+ * <h1>- internal use only -</h1>
+ * <p>
+ * <b>WARNING</b>: Do <b>NOT</b> use any of the classes provided by this package! <br/>
+ * These may be changed or removed without notice!
+ * </p>
+ *
+ * @since 2.0
+ */
+public final class _Hashes {
+
+    @RequiredArgsConstructor
+    public static enum Algorithm {
+        MD5("MD5"),
+        SHA1("SHA"),
+        SHA224("SHA-224"),
+        SHA256("SHA-256"),
+        SHA384("SHA-384"),
+        SHA512("SHA-512"),
+        ;
+        private final String algorithmName;
+        
+        public Optional<MessageDigest> getMessageDigest() {
+            try {
+                return Optional.ofNullable(MessageDigest.getInstance(algorithmName));
+            } catch (NoSuchAlgorithmException e) {
+                return Optional.empty();
+            }
+        }
+        
+    }
+    
+    public static Optional<byte[]> digest(@NonNull Algorithm algorithm, @Nullable byte[] bytes) {
+        final int size = _NullSafe.size(bytes); 
+        if(size==0) {
+            return Optional.empty();
+        }
+        return algorithm.getMessageDigest()
+        .map(md->digest(md, new ByteArrayInputStream(bytes), Math.max(size, 4096)));
+    }
+    
+    
+    // -- HELPER
+    
+    @SneakyThrows
+    private static byte[] digest(@NonNull MessageDigest md, @NonNull InputStream inputStream, int buffersize) {
+        md.reset();
+        try(DigestInputStream dis = new DigestInputStream(inputStream, md)){
+            byte[] buffer = new byte[buffersize];
+            while(dis.read(buffer)>0);
+        }
+        return md.digest();
+    }
+    
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
index cf4a77a..1c2713d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java
@@ -109,7 +109,7 @@ extends RecreatableObjectFacetAbstract {
         .forEach(property->{
             final ManagedObject propertyValue = 
                     property.get(ownerAdapter, InteractionInitiatedBy.FRAMEWORK);
-            if(propertyValue != null) {
+            if(propertyValue != null && propertyValue.getPojo()!=null) {
                 memento.put(property.getId(), propertyValue.getPojo());
             }
         });
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
index 0137323..9209146 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/urlencoding/UrlEncodingServiceNaiveInMemory.java
@@ -1,8 +1,8 @@
 package demoapp.dom._infra.urlencoding;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -14,12 +14,19 @@ import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.hash._Hashes;
+import org.apache.isis.core.commons.internal.hash._Hashes.Algorithm;
 
+import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 /**
  * Encoding blobs for view models will exceed the length allowed for an HTTP header;
- * this service will instead subsitute with a UUID.
+ * this service will instead substitute with a UUID.
  */
 @Service
 @Named("demo.UrlEncodingServiceInMemory")
@@ -29,25 +36,83 @@ import lombok.val;
 public class UrlEncodingServiceNaiveInMemory implements UrlEncodingService {
 
     // this is a memory leak, so don't do this in a real app...
-    private final Map<String,String> map = new HashMap<>();
+    private final Map<String, String> map = new HashMap<>();
 
     @Override
     public String encode(byte[] bytes) {
-        val encoded = urlEncodingService.encode(bytes);
-        val key = UUID.randomUUID().toString();
-        map.put(key, encoded);
-        return key;
+
+        val encodedString = urlEncodingService.encode(bytes);
+        if(encodedString.length()<4096) {
+            return EncodingType.PASS_THROUGH.encode(encodedString);
+        }
+                
+        val hashBytes = _Hashes.digest(Algorithm.SHA512, bytes)
+                .orElseThrow(()->_Exceptions.unrecoverable("failed to generate SHA-512 hash"));
+        
+        val base64Key = _Strings.ofBytes(_Bytes.asUrlBase64.apply(hashBytes), StandardCharsets.UTF_8);
+        
+        map.put(base64Key, encodedString);
+        return EncodingType.HASH_KEYED_CACHE.encode(base64Key);
     }
 
     @Override
-    public byte[] decode(String str) {
-        val value = map.get(str);
-        return urlEncodingService.decode(value);
+    public byte[] decode(String prefixed) {
+        val encodingType = EncodingType.parse(prefixed);
+        val encodedStringOrBase64Key = encodingType.decode(prefixed);
+        
+        switch (encodingType) {
+        case PASS_THROUGH: {
+            val encodedString = encodedStringOrBase64Key;
+            return urlEncodingService.decode(encodedString);
+        }
+        case HASH_KEYED_CACHE: {
+            val base64Key = encodedStringOrBase64Key;
+            val encodedString = map.get(base64Key);
+            return urlEncodingService.decode(encodedString);
+        }
+        default: 
+            throw _Exceptions.unmatchedCase(encodingType);
+        }
     }
 
     @Inject
     @Qualifier("Compression")
     private UrlEncodingService urlEncodingService;
+    
+    // -- HELPER
+    
+    @RequiredArgsConstructor
+    private static enum EncodingType {
+        PASS_THROUGH('P'),
+        HASH_KEYED_CACHE('H');
+        private final char prefix;
+        public String encode(String input) {
+            return prefix + input;
+        }
+        public String decode(String input) {
+            return input.substring(1);
+        }
+        public static EncodingType parse(String input) {
+            if(_NullSafe.size(input)<1) {
+                throw _Exceptions.unrecoverable("input required size underflow");
+            }
+            switch (input.charAt(0)) {
+            case 'P': return EncodingType.PASS_THROUGH;
+            case 'H': return EncodingType.HASH_KEYED_CACHE;
+            default: throw _Exceptions.unmatchedCase(input.charAt(0));
+            }
+        }
+    }
+    
+    
+//    private String encode(final byte[] bytes) {
+//        return _Strings.ofBytes(_Bytes.asUrlBase64.apply(bytes), StandardCharsets.UTF_8);
+//    }
+//
+//    public byte[] decode(final String str) {
+//        return _Bytes.ofUrlBase64.apply(_Strings.toBytes(str, StandardCharsets.UTF_8));
+//    }
 
 
 }
+