You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bd...@apache.org on 2023/01/23 22:27:58 UTC
[directory-scimple] branch rm-keyed-resource created (now 9a9d85c9)
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a change to branch rm-keyed-resource
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
at 9a9d85c9 Remove KeyedResource
This branch includes the following new commits:
new 9a9d85c9 Remove KeyedResource
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[directory-scimple] 01/01: Remove KeyedResource
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch rm-keyed-resource
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
commit 9a9d85c989fe5863a772c59b06e1d877aa801f5e
Author: Brian Demers <bd...@apache.org>
AuthorDate: Fri Jan 20 18:57:06 2023 -0500
Remove KeyedResource
The "key" attribute is not part of the SCIM spec
---
.../scim/core/repository/UpdateRequestTest.java | 2 +-
.../directory/scim/spec/resources/Address.java | 2 +-
.../directory/scim/spec/resources/Email.java | 2 +-
.../directory/scim/spec/resources/Entitlement.java | 2 +-
.../apache/directory/scim/spec/resources/Im.java | 2 +-
.../scim/spec/resources/KeyedResource.java | 56 ----------------------
.../directory/scim/spec/resources/PhoneNumber.java | 4 +-
.../directory/scim/spec/resources/Photo.java | 2 +-
.../apache/directory/scim/spec/resources/Role.java | 2 +-
9 files changed, 10 insertions(+), 64 deletions(-)
diff --git a/scim-core/src/test/java/org/apache/directory/scim/core/repository/UpdateRequestTest.java b/scim-core/src/test/java/org/apache/directory/scim/core/repository/UpdateRequestTest.java
index 669e5f9e..23791ad4 100644
--- a/scim-core/src/test/java/org/apache/directory/scim/core/repository/UpdateRequestTest.java
+++ b/scim-core/src/test/java/org/apache/directory/scim/core/repository/UpdateRequestTest.java
@@ -405,7 +405,7 @@ public class UpdateRequestTest {
localAddress.setType("local");
user2.getAddresses().add(localAddress);
- user1.getAddresses().get(0).setKey("asdf");
+ user1.getAddresses().get(0).setPostalCode("01234");
UpdateRequest<ScimUser> updateRequest = new UpdateRequest<>("1234", user1, user2, schemaRegistry);
List<PatchOperation> result = updateRequest.getPatchOperations();
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Address.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Address.java
index 90fbaf57..e2c829ae 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Address.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Address.java
@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@XmlAccessorType(XmlAccessType.NONE)
@Data
@EqualsAndHashCode(callSuper=false)
-public class Address extends KeyedResource implements Serializable, TypedAttribute {
+public class Address implements Serializable, TypedAttribute {
private static final long serialVersionUID = 3579689988186914163L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Email.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Email.java
index 23f3f4bf..90e1a43f 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Email.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Email.java
@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@XmlAccessorType(XmlAccessType.NONE)
@Data
@EqualsAndHashCode(callSuper=false)
-public class Email extends KeyedResource implements Serializable, TypedAttribute {
+public class Email implements Serializable, TypedAttribute {
private static final long serialVersionUID = -7914234516870440784L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Entitlement.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Entitlement.java
index efe0699d..0d9ada1a 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Entitlement.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Entitlement.java
@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@XmlAccessorType(XmlAccessType.NONE)
@Data
@EqualsAndHashCode(callSuper=false)
-public class Entitlement extends KeyedResource implements Serializable, TypedAttribute {
+public class Entitlement implements Serializable, TypedAttribute {
private static final long serialVersionUID = -5657063764529902479L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Im.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Im.java
index dba7fcc0..a9be385e 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Im.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Im.java
@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@XmlAccessorType(XmlAccessType.NONE)
@Data
@EqualsAndHashCode(callSuper=false)
-public class Im extends KeyedResource implements Serializable, TypedAttribute {
+public class Im implements Serializable, TypedAttribute {
private static final long serialVersionUID = 6324188935390255346L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/KeyedResource.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/KeyedResource.java
deleted file mode 100644
index 41af0f2d..00000000
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/KeyedResource.java
+++ /dev/null
@@ -1,56 +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.directory.scim.spec.resources;
-
-import java.io.Serializable;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlType;
-
-import org.apache.directory.scim.spec.annotation.ScimAttribute;
-import lombok.extern.slf4j.Slf4j;
-
-@XmlType
-@XmlAccessorType(XmlAccessType.NONE)
-@Slf4j
-public class KeyedResource implements Serializable {
-
- private static final long serialVersionUID = 4479747886354926691L;
-
- @XmlElement
- //TODO: Adding ScimAttribute is not valid because adding new fields to the Schema is not allowed. This needs to be revisited.
- @ScimAttribute
- private String key;
-
- public KeyedResource() {
- }
-
- public void setKey(String key) {
- log.debug("Setting the key for a keyed resource to " + key);
-
- this.key = key;
- }
-
- public String getKey() {
- return key;
- }
-}
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/PhoneNumber.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/PhoneNumber.java
index b3925a3a..fa6d8814 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/PhoneNumber.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/PhoneNumber.java
@@ -32,6 +32,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
+import lombok.ToString;
import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CommonTokenStream;
@@ -61,7 +62,8 @@ import lombok.Setter;
@XmlType
@XmlAccessorType(XmlAccessType.NONE)
-public class PhoneNumber extends KeyedResource implements Serializable, TypedAttribute {
+@ToString
+public class PhoneNumber implements Serializable, TypedAttribute {
private static final long serialVersionUID = 607319505715224096L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Photo.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Photo.java
index 67404a5b..7bf1c626 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Photo.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Photo.java
@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@XmlAccessorType(XmlAccessType.NONE)
@Data
@EqualsAndHashCode(callSuper=false)
-public class Photo extends KeyedResource implements Serializable, TypedAttribute {
+public class Photo implements Serializable, TypedAttribute {
private static final long serialVersionUID = 8821620834716156789L;
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Role.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Role.java
index 70f99789..7cff7a14 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Role.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/resources/Role.java
@@ -38,7 +38,7 @@ import lombok.EqualsAndHashCode;
@XmlAccessorType(XmlAccessType.NONE)
@Data
@EqualsAndHashCode(callSuper=false)
-public class Role extends KeyedResource implements Serializable, TypedAttribute {
+public class Role implements Serializable, TypedAttribute {
private static final long serialVersionUID = -2781839189814966670L;