Merge pull request #1206 from microsoft/littleaj/misc_cleanup

Misc cleanup

Author: littleaj

core/spotbugs.exclude.xml

@@ -184,6 +184,11 @@
             </And>
         </Or>
     </Match>
+    <Match>
+        <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
+        <Class name="com.microsoft.applicationinsights.extensibility.initializer.docker.DockerContextInitializer" />
+        <Method name="&lt;init&gt;" />
+    </Match>
     <Match>
         <!-- These rules are fine to skip. -->
         <Or>

core/src/main/java/com/microsoft/applicationinsights/extensibility/initializer/docker/internal/DockerContextPoller.java

@@ -41,7 +41,7 @@ protected DockerContextPoller(File contextFile, DockerContextFactory dockerConte
     }
 
     public DockerContextPoller(String contextFileDirectory) {
-        this(new File(contextFileDirectory + "/" + CONTEXT_FILE_NAME), new DockerContextFactory());
+        this(new File(contextFileDirectory, CONTEXT_FILE_NAME), new DockerContextFactory());
         this.setDaemon(true);
         this.setName(DockerContextPoller.class.getSimpleName());
     }

samples/misc/src/plugins/java/com/microsoft/applicationinsights/sample/plugins/GitBuildInfoContextInitializer.java

@@ -58,8 +58,7 @@ public final class GitBuildInfoContextInitializer implements ContextInitializer
     private boolean hasBuildData;
 
     public GitBuildInfoContextInitializer() {
-        try {
-            InputStream inputStream = getClass().getClassLoader().getResourceAsStream(BUILD_INFO_FILE_NAME);
+        try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(BUILD_INFO_FILE_NAME)) {
             if (inputStream == null) {
                 hasBuildData = false;
                 return;

settings.gradle

@@ -23,7 +23,7 @@ include 'ApplicationInsightsInternalLogger'
 
 include 'agent'
 include 'core'
-include ':logging:common'
+include 'logging:common'
 include 'logging:log4j1_2'
 include 'logging:log4j2'
 include 'logging:logback'