You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/11/24 12:50:52 UTC

[incubator-plc4x] branch develop updated: [plc4j-opm] deactivate caching by default and fixed test

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

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8013c09  [plc4j-opm] deactivate caching by default and fixed test
8013c09 is described below

commit 8013c09a3c3f8482db20d03dd61a644fb9928b1d
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Nov 24 13:42:49 2018 +0100

    [plc4j-opm] deactivate caching by default and fixed test
---
 .../main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java | 3 +++
 .../opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java     | 2 +-
 .../test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java  | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
index 346e07e..5d0573b 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
@@ -325,6 +325,9 @@ public class PlcEntityInterceptor {
     private static boolean needsToBeSynced(Map<String, Instant> lastSynced, Field field) {
         Validate.notNull(field);
         long cacheDurationMillis = field.getAnnotation(PlcField.class).cacheDurationMillis();
+        if (cacheDurationMillis < 0) {
+            return true;
+        }
         String fqn = getFqn(field);
         if (lastSynced.containsKey(fqn)) {
             Instant last = lastSynced.get(fqn);
diff --git a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java
index e6f16a4..5afbee7 100644
--- a/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java
+++ b/plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcField.java
@@ -31,5 +31,5 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 public @interface PlcField {
     String value();
-    long cacheDurationMillis() default 1000;
+    long cacheDurationMillis() default -1;
 }
diff --git a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
index bf54364..cec9809 100644
--- a/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
+++ b/plc4j/utils/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
@@ -91,16 +91,16 @@ public class ConnectedEntityTest {
         // Trigger a fetch
         CachingEntity entity = entityManager.connect(CachingEntity.class, "mock:cached");
         // Trigger Many Fetches via getter
-        IntStream.range(1, 100).forEach(i -> entity.getField());
-        IntStream.range(1, 100).forEach(i -> entity.dummyMethod());
+        IntStream.range(1, 10).forEach(i -> entity.getField());
+        IntStream.range(1, 10).forEach(i -> entity.dummyMethod());
 
-        verify(mock, timeout(1_000).times(2)).read(any());
+        verify(mock, timeout(1_000).times(1)).read(any());
     }
 
     @PlcEntity
     public static class CachingEntity {
 
-        @PlcField(value = "address", cacheDurationMillis = 100)
+        @PlcField(value = "address", cacheDurationMillis = 500)
         private String field;
 
         public CachingEntity() {