formatting, visibilty fixes

jabubake · jabubake · commit 33bccbd7424a · 2017-04-28T15:02:49.000-07:00
removing redundant code
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
@@ -74,7 +74,7 @@ String getKey() {
     }
   }
 
-  private static String appEngineLabelPrefix = "appengine.googleapis.com/";
+  private static final String APPENGINE_LABEL_PREFIX = "appengine.googleapis.com/";
 
   private static Map<String, Label[]> resourceTypeWithLabels;
 
@@ -199,13 +199,12 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
     switch (resourceType) {
       // Trace logging enhancer is supported on GAE Flex and Standard.
       case GaeAppFlex:
-        enhancers = new ArrayList<>();
         enhancers.add(new LabelLoggingEnhancer(
-            appEngineLabelPrefix, Collections.singletonList(Label.InstanceName)));
-        enhancers.add(new TraceLoggingEnhancer(appEngineLabelPrefix));
+            APPENGINE_LABEL_PREFIX, Collections.singletonList(Label.InstanceName)));
+        enhancers.add(new TraceLoggingEnhancer(APPENGINE_LABEL_PREFIX));
         break;
       case GaeAppStandard:
-        enhancers.add(new TraceLoggingEnhancer(appEngineLabelPrefix));
+        enhancers.add(new TraceLoggingEnhancer(APPENGINE_LABEL_PREFIX));
         break;
       default:
         enhancers = Collections.emptyList();
@@ -220,7 +219,7 @@ private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
    *  are restricted to a supported set per resource.
    *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
    */
-  static class LabelLoggingEnhancer implements LoggingEnhancer {
+  private static class LabelLoggingEnhancer implements LoggingEnhancer {
     String prefix;
     List<Label> labels;
 
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
@@ -19,7 +19,8 @@
 /* Adds tracing support for logging with thread-local trace ID tracking. */
 public class TraceLoggingEnhancer implements LoggingEnhancer {
 
-  String prefix;
+  private final String prefix;
+
   public TraceLoggingEnhancer(String prefix) {
     this.prefix = (prefix != null) ? prefix : "";
   }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@`
`19`	`19`	`/* Adds tracing support for logging with thread-local trace ID tracking. */`
`20`	`20`	`public class TraceLoggingEnhancer implements LoggingEnhancer {`
`21`	`21`
`22`		`- String prefix;`
	`22`	`+ private final String prefix;`
	`23`	`+`
`23`	`24`	`public TraceLoggingEnhancer(String prefix) {`
`24`	`25`	`this.prefix = (prefix != null) ? prefix : "";`
`25`	`26`	`}`