From 1d192dfe56e446b4ecd4a29bde8ad7ad80998ee1 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@apache.org>
Date: Mon, 20 Jun 2016 10:49:52 -0700
Subject: [PATCH] Remove scoping annotations on abstract types

These annotations are not meaningful.  Found via error-prone.
---
 .../RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java        | 2 --
 core/src/main/java/org/jclouds/internal/BaseView.java          | 3 ---
 .../org/jclouds/json/internal/NullHackJsonLiteralAdapter.java  | 3 ---
 3 files changed, 8 deletions(-)

diff --git a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java
index 2b1e43dea6..c7220c0cda 100644
--- a/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java
+++ b/compute/src/main/java/org/jclouds/compute/predicates/internal/RefreshAndDoubleCheckOnFailUnlessStatusInvalid.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.annotation.Resource;
-import javax.inject.Singleton;
 
 import org.jclouds.compute.domain.ComputeMetadataIncludingStatus;
 import org.jclouds.logging.Logger;
@@ -37,7 +36,6 @@ import com.google.common.collect.ImmutableSet;
  * resource, so as to eliminate a redundant {@link ComputeService#getNodeMetadata} call after the
  * predicate passes.
  */
-@Singleton
 public abstract class RefreshAndDoubleCheckOnFailUnlessStatusInvalid<S extends Enum<S>, C extends ComputeMetadataIncludingStatus<S>> implements Predicate<AtomicReference<C>> {
 
    private final S intended;
diff --git a/core/src/main/java/org/jclouds/internal/BaseView.java b/core/src/main/java/org/jclouds/internal/BaseView.java
index e7ab8450ed..153bfc5f90 100644
--- a/core/src/main/java/org/jclouds/internal/BaseView.java
+++ b/core/src/main/java/org/jclouds/internal/BaseView.java
@@ -21,8 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.Closeable;
 
-import javax.inject.Singleton;
-
 import org.jclouds.Context;
 import org.jclouds.View;
 import org.jclouds.location.Provider;
@@ -34,7 +32,6 @@ import com.google.common.collect.ForwardingObject;
 import com.google.common.reflect.TypeParameter;
 import com.google.common.reflect.TypeToken;
 
-@Singleton
 public abstract class BaseView extends ForwardingObject implements View {
 
    private final Context backend;
diff --git a/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java b/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java
index b1a23d9df6..15661763d2 100644
--- a/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java
+++ b/core/src/main/java/org/jclouds/json/internal/NullHackJsonLiteralAdapter.java
@@ -20,8 +20,6 @@ import java.io.IOException;
 import java.io.Writer;
 import java.lang.reflect.Field;
 
-import javax.inject.Singleton;
-
 import com.google.common.base.Throwables;
 import com.google.gson.TypeAdapter;
 import com.google.gson.internal.bind.TypeAdapters;
@@ -33,7 +31,6 @@ import com.google.gson.stream.JsonWriter;
  * 
  * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326" />
  */
-@Singleton
 public abstract class NullHackJsonLiteralAdapter<L> extends TypeAdapter<L> {
 
    @Override