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/12/13 06:29:57 UTC
[isis] branch master updated: ISIS-2473: house keeping
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 507e7ed ISIS-2473: house keeping
507e7ed is described below
commit 507e7ed73255c218514abe18b3a153f602d40ee8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Dec 13 07:29:40 2020 +0100
ISIS-2473: house keeping
---
.../org/apache/isis/commons/internal/base/_Refs.java | 16 ++++++++++++++++
.../org/apache/isis/commons/internal/base/_Text.java | 6 +++---
.../_infra/resources/MarkupVariableResolverService.java | 8 ++++----
.../isis/testdomain/rest/MenuBarsResourceTest.java | 7 ++++---
4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Refs.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Refs.java
index 65012ef..6115562 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Refs.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Refs.java
@@ -94,6 +94,14 @@ public final class _Refs {
public boolean isSet(int other) {
return value==other;
}
+
+ public int inc() {
+ return ++value;
+ }
+
+ public int dec() {
+ return --value;
+ }
}
@@ -108,6 +116,14 @@ public final class _Refs {
public boolean isSet(long other) {
return value==other;
}
+
+ public long inc() {
+ return ++value;
+ }
+
+ public long dec() {
+ return --value;
+ }
}
@Data @AllArgsConstructor
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Text.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Text.java
index 43ccaf4..00804e9 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Text.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Text.java
@@ -281,16 +281,16 @@ public final class _Text {
val na = normalize(a);
val nb = normalize(b);
- final int[] lineNrRef = {0};
+ val lineNrRef = _Refs.intRef(0);
if(na.size()<=nb.size()) {
na.zip(nb, (left, right)->{
- final int lineNr = ++lineNrRef[0];
+ final int lineNr = lineNrRef.inc();
_Assert.assertEquals(left, right, ()->String.format("first non matching lineNr %d", lineNr));
});
} else {
nb.zip(na, (right, left)->{
- final int lineNr = ++lineNrRef[0];
+ final int lineNr = lineNrRef.inc();
_Assert.assertEquals(left, right, ()->String.format("first non matching lineNr %d", lineNr));
});
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
index d65c90e..6e45dee 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
@@ -19,12 +19,12 @@
package demoapp.dom._infra.resources;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Named;
import org.springframework.stereotype.Service;
+import org.apache.isis.commons.internal.base._Refs;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.config.environment.IsisSystemEnvironment;
@@ -47,11 +47,11 @@ public class MarkupVariableResolverService {
* @return
*/
public String resolveVariables(String input) {
- val ref = new AtomicReference<String>(input);
+ val stringRef = _Refs.objectRef(input);
constants.forEach((k, v)->{
- ref.set(ref.get().replace(var(k), v));
+ stringRef.update(string->string.replace(var(k), v));
});
- return ref.get();
+ return stringRef.getValue();
}
private String var(String name) {
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java
index c98d552..8cd9180 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/rest/MenuBarsResourceTest.java
@@ -32,6 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.services.menu.MenuBarsService;
+import org.apache.isis.commons.internal.base._Refs;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
@@ -91,16 +92,16 @@ class MenuBarsResourceTest {
assertNotNull(menuBars);
- final ServiceActionLayoutData[] blobDemoMenuRef = {null};
+ val blobDemoMenuRef = _Refs.<ServiceActionLayoutData>objectRef(null);
// find service action by object-type
menuBars.visit(actionLayoutData->{
if("smoketests.BlobDemoMenu".equals(actionLayoutData.getObjectType())) {
- blobDemoMenuRef[0] = actionLayoutData;
+ blobDemoMenuRef.setValue(actionLayoutData);
}
});
- val blobDemoMenu = blobDemoMenuRef[0];
+ val blobDemoMenu = blobDemoMenuRef.getValue();
assertNotNull(blobDemoMenu);