Normalize OnapCommandSchema

discovery is optimized to register the plugins
and http commands from one function

Issue-Id: CLI-66

Change-Id: I3b813862ffd5640c5218c4cced7d10f914dce4ad
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

8 files changed, 5 insertions, 105 deletions

diff --git a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java
index b05267e1..2e7e95eb 100644
--- a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java
+++ b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java
@@ -20,11 +20,11 @@ import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.BasicAuthLoginCommand;
 import org.onap.cli.fw.error.OnapCommandException;
 
-@OnapCommandSchema(name = "basic-login", version = "onap-1.1", type = "auth", schema = "basic-login-onap-1-1.yaml")
+@OnapCommandSchema(schema = "basic-login-onap-1-1.yaml")
 public class OnapBasicAuthLoginCommandAmesterdam extends BasicAuthLoginCommand {
 
     @Override
     protected void run() throws OnapCommandException {
-    	super.run();
+        super.run();
     }
 }
diff --git a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java
index 4a90f7e0..130f71be 100644
--- a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java
+++ b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java
@@ -20,7 +20,7 @@ import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.BasicAuthLogoutCommand;
 import org.onap.cli.fw.error.OnapCommandException;
 
-@OnapCommandSchema(name = "basic-logout", version = "onap-1.1", type = "auth", schema = "basic-logout-onap-1-1.yaml")
+@OnapCommandSchema(schema = "basic-logout-onap-1-1.yaml")
 public class OnapBasicAuthLogoutCommandAmesterdam extends BasicAuthLogoutCommand {
 
     @Override
diff --git a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java
index ba1a7b28..cae9b3fd 100644
--- a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java
+++ b/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java
@@ -20,11 +20,11 @@ import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.BasicAuthLoginCommand;
 import org.onap.cli.fw.error.OnapCommandException;
 
-@OnapCommandSchema(name = "sdc-basic-login", version = "onap-1.1", type = "auth", schema = "basic-login-onap-sdc-1-1.yaml")
+@OnapCommandSchema(schema = "basic-login-onap-sdc-1-1.yaml")
 public class OnapSdcBasicAuthLoginCommandAmesterdam extends BasicAuthLoginCommand {
 
     @Override
     protected void run() throws OnapCommandException {
-    	super.run();
+        super.run();
     }
 }
diff --git a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
deleted file mode 100644
index 1ab3b97a..00000000
--- a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 Huawei Technologies Co., Ltd.
- *
- * 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.
- */
-
-package org.onap.cli.cmd.cs.msb;
-
-import org.onap.cli.fw.OnapCommandSchema;
-import org.onap.cli.fw.cmd.OnapHttpCommand;
-
-@OnapCommandSchema(name = "microservice-create", version = "onap-1.1", schema = "microservice-create-schema.yaml")
-public class OnapServiceCreateCommand extends OnapHttpCommand {
-}
diff --git a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
deleted file mode 100644
index a7424fa0..00000000
--- a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 Huawei Technologies Co., Ltd.
- *
- * 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.
- */
-
-package org.onap.cli.cmd.cs.msb;
-
-import org.onap.cli.fw.OnapCommandSchema;
-import org.onap.cli.fw.cmd.OnapHttpCommand;
-
-@OnapCommandSchema(name = "microservice-delete", version = "onap-1.1", schema = "microservice-delete-schema.yaml")
-public class OnapServiceDeleteCommand extends OnapHttpCommand {
-}
diff --git a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
deleted file mode 100644
index 221b4c0e..00000000
--- a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 Huawei Technologies Co., Ltd.
- *
- * 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.
- */
-
-package org.onap.cli.cmd.cs.msb;
-
-import org.onap.cli.fw.OnapCommandSchema;
-import org.onap.cli.fw.cmd.OnapHttpCommand;
-
-@OnapCommandSchema(name = "microservice-list", version = "onap-1.1", schema = "microservice-list-schema.yaml")
-public class OnapServiceListCommand extends OnapHttpCommand {
-}
diff --git a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java b/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
deleted file mode 100644
index 40cb5315..00000000
--- a/plugins/onap-1.1/features/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 Huawei Technologies Co., Ltd.
- *
- * 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.
- */
-
-package org.onap.cli.cmd.cs.msb;
-
-import org.onap.cli.fw.OnapCommandSchema;
-import org.onap.cli.fw.cmd.OnapHttpCommand;
-
-@OnapCommandSchema(name = "microservice-show", version = "onap-1.1", schema = "microservice-show-schema.yaml")
-public class OnapServiceShowCommand extends OnapHttpCommand {
-}
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/onap-1.1/features/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
deleted file mode 100644
index 527abe0c..00000000
--- a/plugins/onap-1.1/features/msb/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ /dev/null
@@ -1,4 +0,0 @@
-org.onap.cli.cmd.cs.msb.OnapServiceListCommand
-org.onap.cli.cmd.cs.msb.OnapServiceShowCommand
-org.onap.cli.cmd.cs.msb.OnapServiceDeleteCommand
-org.onap.cli.cmd.cs.msb.OnapServiceCreateCommand
\ No newline at end of file