You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2018/11/21 19:20:46 UTC
[1/2] incubator-tamaya-extensions git commit: Update resolver usage
in injection standalone and hazelcast test references
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master beb355543 -> 4ebf7c2f6
Update resolver usage in injection standalone and hazelcast test
references
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/0213e7f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/0213e7f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/0213e7f1
Branch: refs/heads/master
Commit: 0213e7f1fd6ee25c18fec2fb56ee8498e755676e
Parents: 3774a6c
Author: William Lieurance <wi...@namikoda.com>
Authored: Tue Nov 20 23:27:09 2018 -0600
Committer: William Lieurance <wi...@namikoda.com>
Committed: Wed Nov 21 00:02:28 2018 -0600
----------------------------------------------------------------------
.../hazelcast/HazelcastPropertySource.java | 12 --
.../hazelcast/HazelcastPropertySourceTest.java | 206 +++++++++++++++++++
.../hazelcast/HazelcaszPropertySourceTest.java | 204 ------------------
.../tamaya/inject/internal/InjectionHelper.java | 3 +-
4 files changed, 208 insertions(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0213e7f1/modules/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java b/modules/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
index 58b3617..f66b451 100644
--- a/modules/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
+++ b/modules/hazelcast/src/main/java/org/apache/tamaya/hazelcast/HazelcastPropertySource.java
@@ -21,19 +21,7 @@ package org.apache.tamaya.hazelcast;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IList;
-import com.hazelcast.core.IMap;
-import org.apache.tamaya.mutableconfig.ConfigChangeRequest;
-import org.apache.tamaya.mutableconfig.spi.MutablePropertySource;
-import org.apache.tamaya.spi.PropertyValue;
-import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
-
-import java.util.HashMap;
-import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
* Distributed Propertysource using a in-memory hazelcast cluster.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0213e7f1/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
new file mode 100644
index 0000000..51573c7
--- /dev/null
+++ b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcastPropertySourceTest.java
@@ -0,0 +1,206 @@
+/*
+ * 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.tamaya.hazelcast;
+
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.core.IMap;
+import org.apache.tamaya.spi.PropertyValue;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by atsticks on 03.11.16.
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class HazelcastPropertySourceTest {
+
+ private static HazelcastInstance hz;
+ private static HazelcastPropertySource hps;
+
+ @BeforeClass
+ public static void start() {
+ hps = new HazelcastPropertySource();
+ hz = hps.getHazelcastInstance();
+ IMap<Object, Object> map = hz.getMap("config3");
+ map.put("k1", "v1");
+ map.put("k2", "v2");
+ map.put("tamaya.ordinal", "2000");
+ map.flush();
+ IMap<Object, Object> map2 = hz.getMap("config4");
+ map2.put("key1", "val1");
+ map2.put("key2", "val2");
+ map2.flush();
+ }
+
+ @org.junit.Test
+ public void t01_testGetProperties(){
+ hps.setMapReference("config3");
+ Map<String, PropertyValue> values = hps.getProperties();
+ assertNotNull(values);
+ assertEquals(3, values.size());
+ assertNotNull(values.get("k1"));
+ assertNotNull(values.get("k2"));
+ assertEquals("v1", values.get("k1").getValue());
+ assertEquals("v2", values.get("k2").getValue());
+ assertEquals(hps.getOrdinal(), 2000);
+
+ hps.setMapReference("config4");
+ Map<String, PropertyValue> values2 = hps.getProperties();
+ assertNotNull(values2);
+ assertEquals(2, values2.size());
+ assertNotNull(values2.get("key1"));
+ assertNotNull(values2.get("key2"));
+ assertEquals("val1", values2.get("key1").getValue());
+ assertEquals("val2", values2.get("key2").getValue());
+ assertEquals(hps.getOrdinal(), 0);
+
+ hps.setMapReference("bar");
+ hps.setDefaultOrdinal(1500);
+ Map<String, PropertyValue> values3 = hps.getProperties();
+ assertNotNull(values3);
+ assertEquals(0, values3.size());
+ assertEquals(hps.getOrdinal(), 1500);
+ }
+
+ @org.junit.Test
+ public void t02_testGetOrdinal(){
+ hps.setMapReference("config3");
+ hps.setDefaultOrdinal(1500);
+ assertEquals(1500, hps.getDefaultOrdinal());
+ assertEquals(hps.getOrdinal(), 2000);
+
+ hps.setMapReference("config4");
+ hps.setDefaultOrdinal(0);
+ assertEquals(0, hps.getDefaultOrdinal());
+ assertEquals(hps.getOrdinal(), 0);
+
+ hps.setMapReference("bar");
+ hps.setDefaultOrdinal(1500);
+ assertEquals(1500, hps.getDefaultOrdinal());
+ assertEquals(hps.getOrdinal(), 1500);
+ }
+
+ @org.junit.Test
+ public void t03_tesGet(){
+ hps.setMapReference("config3");
+ PropertyValue val1 = hps.get("k1");
+ assertNotNull(val1);
+ assertEquals("v1", val1.getValue());
+ PropertyValue val2 = hps.get("k2");
+ assertNotNull(val2);
+ assertEquals("v2", val2.getValue());
+
+ hps.setMapReference("config4");
+ val1 = hps.get("key1");
+ assertNotNull(val1);
+ assertEquals("val1", val1.getValue());
+ val2 = hps.get("key2");
+ assertNotNull(val2);
+ assertEquals("val2", val2.getValue());
+
+ hps.setMapReference("bar");
+ val1 = hps.get("key1");
+ assertNull(val1);
+ val1 = hps.get("k1");
+ assertNull(val1);
+ }
+
+ @org.junit.Test
+ public void t03_tesGetMapReference(){
+ hps.setMapReference("config3");
+ assertEquals("config3", hps.getMapReference());
+
+ hps.setMapReference("config4");
+ assertEquals("config4", hps.getMapReference());
+ }
+
+ @org.junit.Test
+ public void t03_tesGetSetName(){
+ hps.setMapReference("config3");
+ assertEquals("config3", hps.getMapReference());
+ assertEquals("Hazelcast", hps.getName());
+
+ hps.setMapReference("config4");
+ hps.setName("bar");
+ assertEquals("config4", hps.getMapReference());
+ assertEquals("bar", hps.getName());
+ }
+
+ @org.junit.Test
+ public void t04_testCache() throws InterruptedException {
+ hps.setCacheTimeout(50L);
+ assertTrue(hps.getValidUntil()>= System.currentTimeMillis());
+ assertEquals(50L, hps.getCachePeriod());
+ hps.setMapReference("config3");
+ hps.setDefaultOrdinal(200);
+ Map<String, PropertyValue> values = hps.getProperties();
+ assertNotNull(values);
+ assertEquals(3, values.size());
+ assertNotNull(values.get("k1"));
+ assertNotNull(values.get("k2"));
+ assertEquals("v1", values.get("k1").getValue());
+ assertEquals("v2", values.get("k2").getValue());
+ assertEquals(hps.getOrdinal(), 2000);
+
+ IMap<Object, Object> map = hz.getMap("config3");
+ map.put("k3", "v3");
+ map.remove("tamaya.ordinal");
+ map.flush();
+
+ // Read from cache
+ assertEquals(50L, hps.getCachePeriod());
+ assertTrue(hps.getValidUntil()>= System.currentTimeMillis());
+ values = hps.getProperties();
+ assertNotNull(values);
+ assertEquals(3, values.size());
+ assertNotNull(values.get("k1"));
+ assertNotNull(values.get("k2"));
+ assertEquals("v1", values.get("k1").getValue());
+ assertEquals("v2", values.get("k2").getValue());
+ assertEquals(hps.getOrdinal(), 2000);
+
+ // Let cache timeout
+ Thread.sleep(300L);
+
+ // Read updated values
+ values = hps.getProperties();
+ assertNotNull(values);
+ assertEquals(3, values.size());
+ assertNotNull(values.get("k1"));
+ assertNotNull(values.get("k2"));
+ assertNotNull(values.get("k3"));
+ assertEquals("v1", values.get("k1").getValue());
+ assertEquals("v2", values.get("k2").getValue());
+ assertEquals("v3", values.get("k3").getValue());
+ assertEquals(hps.getOrdinal(), 200);
+ }
+
+ @AfterClass
+ public static void end(){
+ HazelcastUtil.shutdown();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0213e7f1/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcaszPropertySourceTest.java
----------------------------------------------------------------------
diff --git a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcaszPropertySourceTest.java b/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcaszPropertySourceTest.java
deleted file mode 100644
index 9986827..0000000
--- a/modules/hazelcast/src/test/java/org/apache/tamaya/hazelcast/HazelcaszPropertySourceTest.java
+++ /dev/null
@@ -1,204 +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.tamaya.hazelcast;
-
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
-import org.apache.tamaya.spi.PropertyValue;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.runners.MethodSorters;
-
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by atsticks on 03.11.16.
- */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class HazelcaszPropertySourceTest {
-
- private static HazelcastInstance hz = HazelcastUtil.getHazelcastInstance();
- private HazelcastPropertySource hps = new HazelcastPropertySource();
-
- @BeforeClass
- public static void start() {
- IMap<Object, Object> map = hz.getMap("config3");
- map.put("k1", "v1");
- map.put("k2", "v2");
- map.put("tamaya.ordinal", "2000");
- map.flush();
- IMap<Object, Object> map2 = hz.getMap("config4");
- map2.put("key1", "val1");
- map2.put("key2", "val2");
- map2.flush();
- }
-
- @org.junit.Test
- public void t01_testGetProperties(){
- hps.setMapReference("config3");
- Map<String, PropertyValue> values = hps.getProperties();
- assertNotNull(values);
- assertEquals(3, values.size());
- assertNotNull(values.get("k1"));
- assertNotNull(values.get("k2"));
- assertEquals("v1", values.get("k1").getValue());
- assertEquals("v2", values.get("k2").getValue());
- assertEquals(hps.getOrdinal(), 2000);
-
- hps.setMapReference("config4");
- Map<String, PropertyValue> values2 = hps.getProperties();
- assertNotNull(values2);
- assertEquals(2, values2.size());
- assertNotNull(values2.get("key1"));
- assertNotNull(values2.get("key2"));
- assertEquals("val1", values2.get("key1").getValue());
- assertEquals("val2", values2.get("key2").getValue());
- assertEquals(hps.getOrdinal(), 0);
-
- hps.setMapReference("bar");
- hps.setDefaultOrdinal(1500);
- Map<String, PropertyValue> values3 = hps.getProperties();
- assertNotNull(values3);
- assertEquals(0, values3.size());
- assertEquals(hps.getOrdinal(), 1500);
- }
-
- @org.junit.Test
- public void t02_testGetOrdinal(){
- hps.setMapReference("config3");
- hps.setDefaultOrdinal(1500);
- assertEquals(1500, hps.getDefaultOrdinal());
- assertEquals(hps.getOrdinal(), 2000);
-
- hps.setMapReference("config4");
- hps.setDefaultOrdinal(0);
- assertEquals(0, hps.getDefaultOrdinal());
- assertEquals(hps.getOrdinal(), 0);
-
- hps.setMapReference("bar");
- hps.setDefaultOrdinal(1500);
- assertEquals(1500, hps.getDefaultOrdinal());
- assertEquals(hps.getOrdinal(), 1500);
- }
-
- @org.junit.Test
- public void t03_tesGet(){
- hps.setMapReference("config3");
- PropertyValue val1 = hps.get("k1");
- assertNotNull(val1);
- assertEquals("v1", val1.getValue());
- PropertyValue val2 = hps.get("k2");
- assertNotNull(val2);
- assertEquals("v2", val2.getValue());
-
- hps.setMapReference("config4");
- val1 = hps.get("key1");
- assertNotNull(val1);
- assertEquals("val1", val1.getValue());
- val2 = hps.get("key2");
- assertNotNull(val2);
- assertEquals("val2", val2.getValue());
-
- hps.setMapReference("bar");
- val1 = hps.get("key1");
- assertNull(val1);
- val1 = hps.get("k1");
- assertNull(val1);
- }
-
- @org.junit.Test
- public void t03_tesGetMapReference(){
- hps.setMapReference("config3");
- assertEquals("config3", hps.getMapReference());
-
- hps.setMapReference("config4");
- assertEquals("config4", hps.getMapReference());
- }
-
- @org.junit.Test
- public void t03_tesGetSetName(){
- hps.setMapReference("config3");
- assertEquals("config3", hps.getMapReference());
- assertEquals("Hazelcast", hps.getName());
-
- hps.setMapReference("config4");
- hps.setName("bar");
- assertEquals("config4", hps.getMapReference());
- assertEquals("bar", hps.getName());
- }
-
- @org.junit.Test
- public void t04_testCache() throws InterruptedException {
- hps.setCacheTimeout(50L);
- assertTrue(hps.getValidUntil()>= System.currentTimeMillis());
- assertEquals(50L, hps.getCachePeriod());
- hps.setMapReference("config3");
- hps.setDefaultOrdinal(200);
- Map<String, PropertyValue> values = hps.getProperties();
- assertNotNull(values);
- assertEquals(3, values.size());
- assertNotNull(values.get("k1"));
- assertNotNull(values.get("k2"));
- assertEquals("v1", values.get("k1").getValue());
- assertEquals("v2", values.get("k2").getValue());
- assertEquals(hps.getOrdinal(), 2000);
-
- IMap<Object, Object> map = hz.getMap("config3");
- map.put("k3", "v3");
- map.remove("tamaya.ordinal");
- map.flush();
-
- // Read from cache
- assertEquals(50L, hps.getCachePeriod());
- assertTrue(hps.getValidUntil()>= System.currentTimeMillis());
- values = hps.getProperties();
- assertNotNull(values);
- assertEquals(3, values.size());
- assertNotNull(values.get("k1"));
- assertNotNull(values.get("k2"));
- assertEquals("v1", values.get("k1").getValue());
- assertEquals("v2", values.get("k2").getValue());
- assertEquals(hps.getOrdinal(), 2000);
-
- // Let cache timeout
- Thread.sleep(300L);
-
- // Read updated values
- values = hps.getProperties();
- assertNotNull(values);
- assertEquals(3, values.size());
- assertNotNull(values.get("k1"));
- assertNotNull(values.get("k2"));
- assertNotNull(values.get("k3"));
- assertEquals("v1", values.get("k1").getValue());
- assertEquals("v2", values.get("k2").getValue());
- assertEquals("v3", values.get("k3").getValue());
- assertEquals(hps.getOrdinal(), 200);
- }
-
- @AfterClass
- public static void end(){
- HazelcastUtil.shutdown();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0213e7f1/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
----------------------------------------------------------------------
diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index e207819..8e01f9b 100644
--- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@ -41,6 +41,7 @@ import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
+import org.apache.tamaya.spi.PropertyValue;
import org.apache.tamaya.spi.ServiceContextManager;
@@ -225,7 +226,7 @@ final class InjectionHelper {
ExpressionEvaluator evaluator = ServiceContextManager.getServiceContext(classLoader)
.getService(ExpressionEvaluator.class);
if (evaluator != null) {
- return evaluator.evaluateExpression("<injection>", expression, true);
+ return evaluator.evaluateExpression(PropertyValue.createValue("<injection>", expression), true).getValue();
}
return expression;
}
[2/2] incubator-tamaya-extensions git commit: Merge branch
'NOJIRA-get-compilation-clean' of
https://github.com/peculater/incubator-tamaya-extensions
Posted by po...@apache.org.
Merge branch 'NOJIRA-get-compilation-clean' of https://github.com/peculater/incubator-tamaya-extensions
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/4ebf7c2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4ebf7c2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4ebf7c2f
Branch: refs/heads/master
Commit: 4ebf7c2f6e3e8c1dcf3b55b182e67b89c399b1a0
Parents: beb3555 0213e7f
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Nov 21 20:20:39 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Nov 21 20:20:39 2018 +0100
----------------------------------------------------------------------
.../hazelcast/HazelcastPropertySource.java | 12 --
.../hazelcast/HazelcastPropertySourceTest.java | 206 +++++++++++++++++++
.../hazelcast/HazelcaszPropertySourceTest.java | 204 ------------------
.../tamaya/inject/internal/InjectionHelper.java | 7 +-
4 files changed, 211 insertions(+), 218 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4ebf7c2f/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
----------------------------------------------------------------------
diff --cc modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index ba37bdd,8e01f9b..daedacb
--- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@@ -38,9 -38,13 +38,12 @@@ import org.apache.tamaya.inject.spi.Inj
import org.apache.tamaya.inject.api.WithPropertyConverter;
import org.apache.tamaya.inject.spi.ConfiguredType;
import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
- import org.apache.tamaya.spi.*;
-
+ import org.apache.tamaya.spi.ConfigurationContext;
+ import org.apache.tamaya.spi.ConversionContext;
+ import org.apache.tamaya.spi.PropertyConverter;
+ import org.apache.tamaya.spi.PropertyValue;
+ import org.apache.tamaya.spi.ServiceContextManager;
-
/**
* Utility class containing several aspects used in this module.
*/