diff options
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | framework/pom.xml | 10 | ||||
| -rw-r--r-- | framework/src/main/java/org/onap/cli/fw/log/OnapCommandLogger.java | 53 | ||||
| -rw-r--r-- | framework/src/test/java/org/onap/cli/fw/log/OnapCommandLoggerTest.java | 134 | ||||
| -rw-r--r-- | main/src/test/java/org/onap/cli/main/OnapCliMainTest.java | 16 | ||||
| -rw-r--r-- | validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java | 15 |
6 files changed, 3 insertions, 230 deletions
@@ -50,9 +50,4 @@ To run in debug mode, set following environment variables: 1. OPEN_CLI_DEBUG - By default its false, otherwise Set to true 2. OPEN_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number -<h2><a id="More_details_42"></a>More details</h2> -<p><a href="https://wiki.onap.org">https://wiki.onap.org</a></p> - -<h2><a id="Download_42"></a>To download</h2> -<p style="color:red">Please download Open CLI Platform <a href="./open-cli.zip">here</a></p> diff --git a/framework/pom.xml b/framework/pom.xml index 2b7aece2..ce49164b 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -37,16 +37,6 @@ <version>1.17</version> </dependency> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjrt</artifactId> - <version>1.8.10</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>1.8.10</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.6.1</version> diff --git a/framework/src/main/java/org/onap/cli/fw/log/OnapCommandLogger.java b/framework/src/main/java/org/onap/cli/fw/log/OnapCommandLogger.java deleted file mode 100644 index a29d3597..00000000 --- a/framework/src/main/java/org/onap/cli/fw/log/OnapCommandLogger.java +++ /dev/null @@ -1,53 +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.fw.log; - -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Helps to log the command method boundary calls. - * - */ -@Aspect -public class OnapCommandLogger { - private static final Logger LOGGER = LoggerFactory.getLogger(OnapCommandLogger.class); - - //(mrkanag) verify that it logs for all classes in this project. - /** - * Logging intercepter. - * - * @param joinPoint - * joinpoint - * @return object - * @throws Throwable - * exception - */ - @Around("execution(* org.onap.cli.fw*(..))") - public Object log(ProceedingJoinPoint joinPoint) throws Throwable { // NOSONAR - LOGGER.info(joinPoint.getThis().toString() + "->" + joinPoint.getSignature().getName() + "(" - + joinPoint.getArgs() + ")"); - - Object response = joinPoint.proceed(); - LOGGER.info(response.toString()); - - return response; - } -} diff --git a/framework/src/test/java/org/onap/cli/fw/log/OnapCommandLoggerTest.java b/framework/src/test/java/org/onap/cli/fw/log/OnapCommandLoggerTest.java deleted file mode 100644 index 4b675edc..00000000 --- a/framework/src/test/java/org/onap/cli/fw/log/OnapCommandLoggerTest.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright 2016-17 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.fw.log; - -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.reflect.SourceLocation; -import org.aspectj.runtime.internal.AroundClosure; -import org.junit.Test; - -public class OnapCommandLoggerTest { - - @Test - public void logTest() throws Throwable { - - - ProceedingJoinPoint point = new ProceedingJoinPoint() { - @Override - public String toShortString() { - return null; - } - - @Override - public String toLongString() { - return null; - } - - @Override - public Object getThis() { - return new Object(); - } - - @Override - public Object getTarget() { - return null; - } - - @Override - public StaticPart getStaticPart() { - return null; - } - - @Override - public SourceLocation getSourceLocation() { - return null; - } - - @Override - public Signature getSignature() { - return new Signature(){ - - @Override - public Class getDeclaringType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getDeclaringTypeName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getModifiers() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String toLongString() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String toShortString() { - // TODO Auto-generated method stub - return null; - } - - }; - } - - @Override - public String getKind() { - return null; - } - - @Override - public Object[] getArgs() { - return null; - } - - @Override - public void set$AroundClosure(AroundClosure arg0) { - } - - @Override - public Object proceed(Object[] arg0) throws Throwable { - return null; - } - - @Override - public Object proceed() throws Throwable { - return new Object(); - } - }; - - OnapCommandLogger log = new OnapCommandLogger(); - log.log(point); - } - -} diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java index d720ed95..9d3b036c 100644 --- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java +++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java @@ -16,6 +16,8 @@ package org.onap.cli.main; +import static org.junit.Assert.fail; + import java.io.File; import java.io.IOException; import java.net.URL; @@ -24,7 +26,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.aspectj.lang.annotation.After; import org.junit.Ignore; import org.junit.Test; import org.onap.cli.fw.OnapCommand; @@ -37,24 +38,11 @@ import jline.console.ConsoleReader; import mockit.Invocation; import mockit.Mock; import mockit.MockUp; -import static org.junit.Assert.fail; public class OnapCliMainTest { OnapCli cli = null; - /** - * Clean up. - */ - @After(value = "") - public void cleanup() { - if (this.cli != null) { - if (cli.getExitCode() != 0) { - // Fail test case - } - } - } - private void handle(String[] args) { cli = new OnapCli(args); cli.handle(); diff --git a/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java index de55f996..fffec3f5 100644 --- a/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java +++ b/validate/validation/src/test/java/org/onap/cli/validation/OnapValidationTest.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; -import org.aspectj.lang.annotation.After; import org.junit.Ignore; import org.junit.Test; import org.onap.cli.fw.OnapCommandRegistrar; @@ -39,18 +38,6 @@ public class OnapValidationTest { OnapCli cli = null; - /** - * Clean up. - */ - @After(value = "") - public void cleanup() { - if (this.cli != null) { - if (cli.getExitCode() != 0) { - // Fail test case - } - } - } - private void handle(String[] args) { cli = new OnapCli(args); cli.handle(); @@ -84,7 +71,7 @@ public class OnapValidationTest { System.out.println("==========================\n\n"); int i = 1; for (SchemaInfo sch : OnapCommandRegistrar.getRegistrar().listCommandInfo()) { - if (sch.isIgnore()) { + if (sch.isIgnore()) { continue; } if (sch.getProduct().equals(version)) { |