From 41b5302f93b1a3ac13ddab068cecb8ea99a91f05 Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Wed, 3 Jan 2018 14:21:30 -0800 Subject: [PATCH] Sonar suggestions - file name and constants - moved class files into a directory that complies with Java naming conventions - extracted a duplicated string literal into a constant Change-Id: I3d0b1378746ee1c7a3d4e541e9d09943886de312 --- .../onosproject}/HuaweiModelRegistrator.java | 16 +++++++++------- .../java/{ => org/onosproject}/package-info.java | 0 2 files changed, 9 insertions(+), 7 deletions(-) rename models/huawei/src/main/java/{ => org/onosproject}/HuaweiModelRegistrator.java (83%) rename models/huawei/src/main/java/{ => org/onosproject}/package-info.java (100%) diff --git a/models/huawei/src/main/java/HuaweiModelRegistrator.java b/models/huawei/src/main/java/org/onosproject/HuaweiModelRegistrator.java similarity index 83% rename from models/huawei/src/main/java/HuaweiModelRegistrator.java rename to models/huawei/src/main/java/org/onosproject/HuaweiModelRegistrator.java index 912d068b9b..0532af05c0 100644 --- a/models/huawei/src/main/java/HuaweiModelRegistrator.java +++ b/models/huawei/src/main/java/org/onosproject/HuaweiModelRegistrator.java @@ -41,6 +41,8 @@ import java.util.Map; @Component(immediate = true) public class HuaweiModelRegistrator extends AbstractYangModelRegistrator { + private static final String MODEL_VERSION = "2014-12-25"; + /** * Creates L3VPN model registrator. */ @@ -50,19 +52,19 @@ public class HuaweiModelRegistrator extends AbstractYangModelRegistrator { private static Map getAppInfo() { Map appInfo = new HashMap<>(); - appInfo.put(new DefaultYangModuleId("ne-bgpcomm", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-bgpcomm", MODEL_VERSION), new DefaultAppModuleInfo(NeBgpcomm.class, null)); - appInfo.put(new DefaultYangModuleId("ne-bgpcomm-type", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-bgpcomm-type", MODEL_VERSION), new DefaultAppModuleInfo(NeBgpcommType.class, null)); - appInfo.put(new DefaultYangModuleId("ne-l3vpn-api", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-l3vpn-api", MODEL_VERSION), new DefaultAppModuleInfo(NeL3VpnApi.class, null)); - appInfo.put(new DefaultYangModuleId("ne-l3vpncomm", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-l3vpncomm", MODEL_VERSION), new DefaultAppModuleInfo(NeL3Vpncomm.class, null)); - appInfo.put(new DefaultYangModuleId("ne-l3vpncomm-type", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-l3vpncomm-type", MODEL_VERSION), new DefaultAppModuleInfo(NeL3VpncommType.class, null)); - appInfo.put(new DefaultYangModuleId("ne-tnlm", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-tnlm", MODEL_VERSION), new DefaultAppModuleInfo(NeTnlm.class, null)); - appInfo.put(new DefaultYangModuleId("ne-tnlm-type", "2014-12-25"), + appInfo.put(new DefaultYangModuleId("ne-tnlm-type", MODEL_VERSION), new DefaultAppModuleInfo(NeTnlmType.class, null)); return ImmutableMap.copyOf(appInfo); } diff --git a/models/huawei/src/main/java/package-info.java b/models/huawei/src/main/java/org/onosproject/package-info.java similarity index 100% rename from models/huawei/src/main/java/package-info.java rename to models/huawei/src/main/java/org/onosproject/package-info.java