From 09a33c77315ab93d72aa401abdec132f5cd091d5 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 7 Mar 2022 14:30:34 +0100
Subject: [PATCH] Polish

---
 ...ultDestinationPublishingMeterRegistry.java | 16 ++++++----
 update-version.sh                             | 29 -------------------
 2 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100755 update-version.sh

diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DefaultDestinationPublishingMeterRegistry.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DefaultDestinationPublishingMeterRegistry.java
index 91277c5f9..b01b68e58 100644
--- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DefaultDestinationPublishingMeterRegistry.java
+++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/micrometer/DefaultDestinationPublishingMeterRegistry.java
@@ -44,7 +44,6 @@ import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import io.micrometer.core.instrument.distribution.pause.PauseDetector;
 import io.micrometer.core.instrument.internal.DefaultGauge;
-import io.micrometer.core.instrument.internal.DefaultLongTaskTimer;
 import io.micrometer.core.instrument.internal.DefaultMeter;
 import io.micrometer.core.instrument.step.StepCounter;
 import io.micrometer.core.instrument.step.StepDistributionSummary;
@@ -133,10 +132,10 @@ class DefaultDestinationPublishingMeterRegistry extends MeterRegistry
 				this.metricsPublisherConfig.step().toMillis());
 	}
 
-	@Override
-	protected LongTaskTimer newLongTaskTimer(Meter.Id id) {
-		return new DefaultLongTaskTimer(id, this.clock);
-	}
+//	@Override
+//	protected LongTaskTimer newLongTaskTimer(Meter.Id id) {
+//		return new DefaultLongTaskTimer(id, this.clock);
+//	}
 
 	@Override
 	protected TimeUnit getBaseTimeUnit() {
@@ -230,6 +229,12 @@ class DefaultDestinationPublishingMeterRegistry extends MeterRegistry
 		return new Metric<Number>(timer.getId(), timer.takeSnapshot());
 	}
 
+	@Override
+	protected LongTaskTimer newLongTaskTimer(Id id, DistributionStatisticConfig distributionStatisticConfig) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	/**
 	 *
 	 */
@@ -250,5 +255,4 @@ class DefaultDestinationPublishingMeterRegistry extends MeterRegistry
 		}
 
 	}
-
 }
diff --git a/update-version.sh b/update-version.sh
deleted file mode 100755
index f004f0682..000000000
--- a/update-version.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-#Execute this script from local checkout of spring cloud stream
-
-./mvnw versions:update-parent -DparentVersion=[0.0.1,$2] -Pspring -DgenerateBackupPoms=false -DallowSnapshots=true
-./mvnw versions:set -DnewVersion=$1 -DgenerateBackupPoms=false
-./mvnw versions:set -DnewVersion=$1 -DgenerateBackupPoms=false -pl :spring-cloud-stream-tools
-
-
-lines=$(find . -name 'pom.xml' | xargs egrep "SNAPSHOT|M[0-9]|RC[0-9]" | grep -v regex | wc -l)
-if [ $lines -eq 0 ]; then
-	echo "No snapshots found"
-else
-	echo "Snapshots found."
-fi
-
-lines=$(find . -name 'pom.xml' | xargs egrep "M[0-9]" | grep -v regex | wc -l)
-if [ $lines -eq 0 ]; then
-	echo "No milestones found"
-else
-	echo "Milestones found."
-fi
-
-lines=$(find . -name 'pom.xml' | xargs egrep "RC[0-9]" | grep -v regex | wc -l)
-if [ $lines -eq 0 ]; then
-	echo "No release candidates found"
-else
-	echo "Release candidates found."
-fi