Remove Scope.java and use String instead. (#2541)

Author: christiangoerdes

core/src/main/java/com/predic8/membrane/core/interceptor/apikey/stores/inConfig/Key.java

@@ -26,19 +26,19 @@
 @MCElement(name = "secret", component = false)
 public class Key {
 
-    private final List<Scope> scopes = new ArrayList<>();
+    private final List<String> scopes = new ArrayList<>();
 
     private String value;
 
     /**
-     * @description <scope>...</scope> elements for defining scopes for this key.
+     * @description Scopes for this key.
      */
     @MCChildElement(allowForeign = true)
-    public void setScopes(List<Scope> scopes) {
+    public void setScopes(List<String> scopes) {
         this.scopes.addAll(scopes);
     }
 
-    public List<Scope> getScopes() {
+    public List<String> getScopes() {
         return scopes;
     }
 

core/src/main/java/com/predic8/membrane/core/interceptor/apikey/stores/inConfig/Scope.java

@@ -45,9 +45,7 @@ public List<Key> getKeys() {
     public Optional<Set<String>> getScopes(String apiKey) throws UnauthorizedApiKeyException {
         var key = keys.stream().filter(k -> k.getValue().equals(apiKey)).findFirst();
         if (key.isPresent()) {
-            Set<String> scopeValues = key.get().getScopes().stream()
-                    .map(Scope::getValue)
-                    .collect(toSet());
+            Set<String> scopeValues = new HashSet<>(key.get().getScopes());
             return ofNullable(scopeValues.isEmpty() ? null : scopeValues);
         } else {
             throw new UnauthorizedApiKeyException();

core/src/main/java/com/predic8/membrane/core/interceptor/apikey/stores/inConfig/SimpleKeyStore.java

@@ -32,10 +32,7 @@ void getScopes() throws UnauthorizedApiKeyException {
                 new Key(){{setValue("12345");}},
                 new Key(){{
                     setValue("67890");
-                    setScopes(of(
-                            new Scope(){{setValue("admin");}},
-                            new Scope(){{setValue("user");}})
-                    );
+                    setScopes(of("admin", "user"));
                 }})
         );
         assertEquals(empty(), simpleKeyStore.getScopes("12345"));