Refactor: Build script and code clean up for mappingmanagement app
Change-Id: I0a3b12880645d50ff42397f87c80e67ff037fb08
diff --git a/apps/mappingmanagement/api/BUCK b/apps/mappingmanagement/api/BUCK
index 223b9a9..57e84f4 100644
--- a/apps/mappingmanagement/api/BUCK
+++ b/apps/mappingmanagement/api/BUCK
@@ -5,9 +5,6 @@
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
- '//utils/osgi:onlab-osgi-tests',
- '//web/api:onos-rest-tests',
- '//incubator/api:onos-incubator-api-tests',
]
osgi_jar_with_tests (
diff --git a/apps/mappingmanagement/api/pom.xml b/apps/mappingmanagement/api/pom.xml
index 147b5eb..23ec6bb 100644
--- a/apps/mappingmanagement/api/pom.xml
+++ b/apps/mappingmanagement/api/pom.xml
@@ -43,11 +43,6 @@
<artifactId>onos-core-serializers</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-incubator-api</artifactId>
- </dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
@@ -56,41 +51,9 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
- <artifactId>onlab-osgi</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
<artifactId>onos-core-common</artifactId>
<scope>test</scope>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-rest</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-rest</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java
index c881269..03d8634 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/codec/MappingInstructionCodec.java
@@ -29,7 +29,7 @@
*/
public final class MappingInstructionCodec extends JsonCodec<MappingInstruction> {
- protected static final Logger log = LoggerFactory.getLogger(MappingInstruction.class);
+ protected static final Logger log = LoggerFactory.getLogger(MappingInstructionCodec.class);
protected static final String TYPE = "type";
protected static final String SUBTYPE = "subtype";
diff --git a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/MappingWebResource.java b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/MappingWebResource.java
index 93fe93e..f1dfb4e 100644
--- a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/MappingWebResource.java
+++ b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/MappingWebResource.java
@@ -32,7 +32,7 @@
// FIXME: dummy method for generating swagger.json file
@GET
@Produces(MediaType.APPLICATION_JSON)
- public Response getAlarms() {
+ public Response getMappings() {
return null;
}
}