summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2019-06-24 08:38:21 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-24 08:38:21 +0000
commit684ff0dabeadf97f2affa268145c118206024f57 (patch)
tree33cce1dfef6893cf99c715b51c8e93bd04442f6a
parentda3fb08c64dd5edf981fa0838a07745543c5eb73 (diff)
parent9594bc115e27c6589799c885009fc4ff22fa65f5 (diff)
Merge "db modify 2"
-rw-r--r--components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java45
-rw-r--r--components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/domain/DbConfigTest.java47
2 files changed, 0 insertions, 92 deletions
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java
deleted file mode 100644
index 557b545c..00000000
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP : DataLake
- * ================================================================================
- * Copyright 2019 QCT
- *=================================================================================
- * Licensed 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.
- * ============LICENSE_END=========================================================
- */
-package org.onap.datalake.feeder.controller.domain;
-
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * JSON request body for DB manipulation.
- *
- * @author Kate Hsuan
- *
- */
-
-@Getter
-@Setter
-public class DbConfig {
- private String name;
- private String host;
- private boolean enabled;
- private String login;
- private String password;
- private boolean encrypt;
- private String database;
- private int port;
- private String poperties;
-}
diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/domain/DbConfigTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/domain/DbConfigTest.java
deleted file mode 100644
index 2c53def4..00000000
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/domain/DbConfigTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : DATALAKE
- * ================================================================================
- * Copyright (C) 2018-2019 Huawei. All rights reserved.
- * ================================================================================
- * Licensed 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.datalake.feeder.controller.domain;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class DbConfigTest {
- @Test
- public void testDbConfig() {
- DbConfig dbConfig = new DbConfig();
- dbConfig.setName("elasticsearch");
- assertTrue("elasticsearch".equals(dbConfig.getName()));
- dbConfig.setHost("localhost");
- assertTrue("localhost".equals(dbConfig.getHost()));
- dbConfig.setLogin("root");
- assertTrue("root".equals(dbConfig.getLogin()));
- dbConfig.setPassword("root123");
- assertTrue("root123".equals(dbConfig.getPassword()));
- dbConfig.setDatabase("elasticsearch");
- assertTrue("elasticsearch".equals(dbConfig.getDatabase()));
- dbConfig.setPort(123);
- assertEquals(123, dbConfig.getPort());
- dbConfig.setPoperties("driver");
- assertTrue("driver".equals(dbConfig.getPoperties()));
- }
-}