You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/08/20 14:39:45 UTC
[07/16] incubator-brooklyn git commit: Delete deprecated
RegistryLocationResolver
Delete deprecated RegistryLocationResolver
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5c8ff2a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5c8ff2a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5c8ff2a9
Branch: refs/heads/master
Commit: 5c8ff2a9d52f9abdce7d0f408d3f69ff950d3f39
Parents: 1ffacc6
Author: Aled Sage <al...@gmail.com>
Authored: Wed Aug 19 18:39:04 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Aug 20 12:04:12 2015 +0100
----------------------------------------------------------------------
.../core/location/BasicLocationRegistry.java | 2 +-
.../core/location/RegistryLocationResolver.java | 42 --------------------
2 files changed, 1 insertion(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c8ff2a9/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
index b6319b4..f8b7c73 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationRegistry.java
@@ -400,7 +400,7 @@ public class BasicLocationRegistry implements LocationRegistry {
return null;
}
- /** providers default impl for RegistryLocationResolver.accepts */
+ /** providers default impl for {@link LocationResolver#accepts(String, LocationRegistry)} */
public static boolean isResolverPrefixForSpec(LocationResolver resolver, String spec, boolean argumentRequired) {
if (spec==null) return false;
if (spec.startsWith(resolver.getPrefix()+":")) return true;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c8ff2a9/core/src/main/java/org/apache/brooklyn/core/location/RegistryLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/RegistryLocationResolver.java b/core/src/main/java/org/apache/brooklyn/core/location/RegistryLocationResolver.java
deleted file mode 100644
index a2cf5fa..0000000
--- a/core/src/main/java/org/apache/brooklyn/core/location/RegistryLocationResolver.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.brooklyn.core.location;
-
-import java.util.Map;
-
-import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.api.location.LocationRegistry;
-import org.apache.brooklyn.api.location.LocationResolver;
-
-/**
- * Extension to LocationResolver which can take a registry.
- *
- * @deprecated since 0.6; the LocationResolver always takes the LocationRegistry now
- */
-@Deprecated
-public interface RegistryLocationResolver extends LocationResolver {
-
- @Override
- @SuppressWarnings("rawtypes")
- Location newLocationFromString(Map locationFlags, String spec, LocationRegistry registry);
-
- @Override
- boolean accepts(String spec, LocationRegistry registry);
-
-}