X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2FDashboardApplication.java;h=9dfa584674c1e15f158ca442960727d74de7038c;hb=93a44cb851a49c923126f32016646860d104075c;hp=15c082f9b4f8ad7c4b0ff0ca32dccca231297d35;hpb=f660cae7a447b60d84ef75f7c2bcbf62412d4579;p=portal%2Fric-dashboard.git diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java index 15c082f9..9dfa5846 100644 --- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java @@ -1,6 +1,6 @@ /*- * ========================LICENSE_START================================= - * ORAN-OSC + * O-RAN-SC * %% * Copyright (C) 2019 AT&T Intellectual Property and Nokia * %% @@ -28,8 +28,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -// Limit the annotation scan to the dashboard classes; -// exclude the generated client classes! +// Using this package limits the annotation scan to the dashboard classes. +// Do not want Spring to find the autowired annotations in the generated +// classes. @ComponentScan("org.oransc.ric.portal.dashboard") public class DashboardApplication { @@ -38,19 +39,22 @@ public class DashboardApplication { public static void main(String[] args) { SpringApplication.run(DashboardApplication.class, args); // Force this onto the console by using level WARN - logger.warn("main: version '{}' successful start", getVersion()); + logger.warn("main: version '{}' successful start", + getImplementationVersion(MethodHandles.lookup().lookupClass())); } /** - * Gets version details. + * Gets version details for the specified class. + * + * @param clazz + * Class to get the version * * @return the value of the MANIFEST.MF property Implementation-Version as * written by maven when packaged in a jar; 'unknown' otherwise. */ - private static String getVersion() { - Class clazz = MethodHandles.lookup().lookupClass(); + public static String getImplementationVersion(Class clazz) { String classPath = clazz.getResource(clazz.getSimpleName() + ".class").toString(); - return classPath.startsWith("jar") ? clazz.getPackage().getImplementationVersion() : "unknown"; + return classPath.startsWith("jar") ? clazz.getPackage().getImplementationVersion() : "unknown-not-jar"; } }