db modify 2

Change-Id: I32cc643bf9c86d78edc0bc6bf8a7e94fb1721735
Issue-ID: DCAEGEN2-1622
Signed-off-by: ZhangZihao <zhangzihao@chinamobile.com>

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 (file)
index 557b545..0000000
--- 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 (file)
index 2c53def..0000000
--- 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()));
-    }
-}