yuandian/yd-common-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: yuandian:develop
Branches Tags
yuandian:master
yuandian:develop
yuandian:v1.0.3
yuandian:v1.0.1
..
compare: yuandian:master
Branches Tags
yuandian:develop
yuandian:master
yuandian:v1.0.3
yuandian:v1.0.1

1 Commits
develop ... master

Author SHA1 Message Date
eson
cf3ae04b13 去掉SNAPSHOT 2022-06-28 14:42:35 +08:00
4 changed files with 43 additions and 167 deletions
Show Stats Expand all files Collapse all files

6
README.md
View File

@ -91,11 +91,7 @@ cnf.seek("key1", "key2").set("do_set"); // seek先定位keys
#### setWithCreate方法 赋值. 如果key不存在就创建
```java
Config.UseConfig((cnf) -> {
ArrayList<Object> values = new ArrayList<Object>(); // 数组配置1 2 3
values.add(1);
values.add(2);
values.add(3);
int[] values = new int[]{1,2,3} ; // 数组配置
cnf.seek("listKeys1", "listKeys2").setWithCreate( values ); // 如果不存在key创建.
// listKeys1:
// listKeys2:

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.yuandian.common</groupId>
<artifactId>config</artifactId>
<version>1.0.4-SNAPSHOT</version>
<version>1.0.3</version>
<packaging>jar</packaging>
<name>config</name>
<url>http://yuandian.com</url>

164
src/main/java/com/yuandian/common/Config.java
View File

@ -6,7 +6,6 @@
*/
package com.yuandian.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@ -136,48 +135,29 @@ public class Config {
* @param keys 获取的key值
* @return
*/
public <T> T get(Object... keys) {
Object cur = data;
for (var i = 0; i < keys.length; i++) {
public Object get(String... keys) {
var cur = data;
for (var i = 0; i < keys.length - 1; i++) {
var key = keys[i];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
cur = opcur.get((int)key);
} else {
var opcur = (Map<String, Object>)cur ;
cur = opcur.get(key);
}
cur = (Map<String, Object>) cur.get(key);
}
return (T)cur;
// return (T)cur.get(keys[keys.length - 1]);
return cur.get(keys[keys.length - 1]);
}
/**
* 判断 keys 是否存在
*
* @param keys 获取的key值
* @return
*/
public boolean exists(Object... keys) {
Object cur = data;
for (var i = 0; i < keys.length; i++) {
if(cur == null) {
return false;
}
public boolean exists(String... keys) {
var cur = data;
for (var i = 0; i < keys.length - 1; i++) {
var key = keys[i];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
cur = opcur.get((int)key);
} else {
var opcur = (Map<String, Object>)cur ;
cur = opcur.get(key);
}
cur = (Map<String, Object>) cur.get(key);
}
return true;
return cur.get(keys[keys.length-1]) != null;
}
/**
@ -189,9 +169,9 @@ public class Config {
*/
public class Operator {
Config config;
Object[] keys;
String[] keys;
Operator(Config config, Object[] keys) {
Operator(Config config, String[] keys) {
this.config = config;
this.keys = keys;
}
@ -202,34 +182,19 @@ public class Config {
* @return 返回自身。
*/
public Operator createKeys() {
Object cur = config.data;
var cur = config.data;
for (var i = 0;;) {
var key = keys[i];
Object vobj;
// var vobj = cur.get(key);
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
vobj = opcur.get((int)key);
if (vobj == null) {
vobj = new ArrayList<Object>();
opcur.set((int)key, vobj);
}
} else {
var opcur = (Map<String, Object>)cur ;
vobj = opcur.get(key);
if (vobj == null) {
vobj = new LinkedHashMap<>();
opcur.put((String)key, vobj);
}
var vobj = cur.get(key);
if (vobj == null) {
vobj = new LinkedHashMap<>();
cur.put(key, vobj);
}
i++;
if (i >= keys.length) {
break;
}
cur = vobj;
cur = (Map<String, Object>) vobj;
}
return this;
}
@ -240,28 +205,12 @@ public class Config {
* @param value 赋值
*/
public void set(Object value) {
Object cur = config.data;
var cur = config.data;
for (var i = 0; i < keys.length - 1; i++) {
var key = keys[i];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
cur = opcur.get((int)key);
} else {
var opcur = (Map<String, Object>)cur ;
cur = opcur.get(key);
}
}
var key = keys[keys.length - 1];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
opcur.set((int)key, value);
} else {
var opcur = (Map<String, Object>)cur ;
opcur.put((String)key, value);
cur = (Map<String, Object>) cur.get(key);
}
cur.put(keys[keys.length - 1], value);
}
/**
@ -270,48 +219,18 @@ public class Config {
* @param value 赋值
*/
public void setWithCreate(Object value) {
Object cur = config.data;
var cur = config.data;
for (var i = 0; i < keys.length - 1; i++) {
var key = keys[i];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
Object vobj = opcur.get((int)key);
if (vobj == null) {
vobj = new ArrayList<Object>();
opcur.set((int)key, vobj);
}
cur = vobj;
} else {
var opcur = (Map<String, Object>)cur ;
Object vobj = opcur.get(key);
if (vobj == null) {
vobj = new LinkedHashMap<>();
opcur.put((String)key, vobj);
}
cur = vobj;
var curValue = cur.get(key);
if(curValue == null) {
curValue = new LinkedHashMap<>();
cur.put(key, curValue);
}
cur = (Map<String, Object>)curValue;
}
var key = keys[keys.length - 1];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
Object vobj = opcur.get((int)key);
if (vobj == null) {
vobj = new ArrayList<Object>();
opcur.set((int)key, vobj);
}
} else {
var opcur = (Map<String, Object>)cur ;
Object vobj = opcur.get(key);
if (vobj == null) {
vobj = new LinkedHashMap<>();
opcur.put((String)key, vobj);
}
}
cur.put(keys[keys.length - 1], value);
}
}
@ -332,28 +251,13 @@ public class Config {
* @param keys
* @return
*/
public <T> T remove(Object... keys) {
Object cur = data;
public Object remove(String... keys) {
var cur = data;
for (var i = 0; i < keys.length - 1; i++) {
var key = keys[i];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur ;
cur = opcur.get((int)key);
} else {
var opcur = (Map<String, Object>)cur ;
cur = opcur.get(key);
}
}
var key = keys[keys.length - 1];
if(key.getClass() != String.class ) {
var opcur = (ArrayList<Object>)cur;
return (T)opcur.remove((int)key);
} else {
var opcur = (Map<String, Object>)cur ;
return (T)opcur.remove(key);
cur = (Map<String, Object>) cur.get(key);
}
return cur.remove(keys[keys.length - 1]);
}
/**

38
src/test/java/com/yuandian/common/ConfigTest.java
View File

@ -35,7 +35,7 @@ public class ConfigTest {
* key2:
* path_value
*/
log.info("{}", (Object)cnf.get("key1", "key2"));
log.info("{}",cnf.get("key1", "key2"));
return null;
});
}
@ -94,6 +94,8 @@ public class ConfigTest {
Instant now = Instant.now();
cnf.data.put("use_config", now.toString());
try {
log.info("{}",cnf.update());
} catch (NacosException e) {
@ -156,21 +158,6 @@ public class ConfigTest {
return null;
});
}
@Test
@Order(5)
void testConfigGetArray() throws Exception {
Config.UseConfig((cnf) -> {
/**
* nacos config 默认 group=yuandian dataId=dataflow
* key1:
* key2:
* path_value
*/
log.info("{}", (Object)cnf.get("listKeys1", "listKeys2", 1));
return null;
});
}
@Test
@Order(1)
@ -194,7 +181,7 @@ public class ConfigTest {
void testLabelConfig() throws Exception {
Config.UseConfig("org.fortest", (cnf)->{
log.info("{}", (Object)cnf.get("test"));
log.info("{}", cnf.get("test"));
Assertions.assertEquals(cnf.get("test"), "groupAndDataId");
return null;
});
@ -208,11 +195,7 @@ public class ConfigTest {
void testSetListValues() throws Exception {
Config.UseConfig((cnf) -> {
ArrayList<Object> values = new ArrayList<Object>();
values.add(1);
values.add(2);
values.add(3);
int[] values = new int[]{1,2,3} ;
cnf.seek("listKeys1", "listKeys2").setWithCreate( values ); // 如果不存在key创建.
// listKeys1:
// listKeys2:
@ -235,11 +218,7 @@ public class ConfigTest {
void testMapData() throws Exception {
Config.UseConfig((cnf)->{
ArrayList<Object> values = new ArrayList<Object>() ;
values.add(1);
values.add(2);
values.add(3);
int[] values = new int[]{1,2,3} ;
cnf.seek("listKeys1", "listKeys2").setWithCreate( values ); // 如果不存在key创建.
// listKeys1:
// listKeys2:
@ -255,12 +234,9 @@ public class ConfigTest {
});
Config.UseConfig((cnf) -> {
log.info("{}", cnf.data); // Map<String, Object> data
var key2 = (Map<String, Object>) (cnf.data.get("listKeys1"));
ArrayList<Object> listKeys2 = (ArrayList<Object>)key2.get("listKeys2");
listKeys2.set(1,10); // 数组 1 2 3 的2为 10
((int[])key2.get("listKeys2"))[1] = 10; // 数组 1 2 3 的2为 10
try {
log.info("{}",cnf.update());
} catch (NacosException e) {