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 2025/03/19 13:51:51 UTC
(directory-scimple) 01/02: Removing lombok annotations
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch delombok
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
commit ee59ccec47e5b27a4b24dbe7524876802579cabe
Author: Brian Demers <bd...@apache.org>
AuthorDate: Tue Mar 18 15:16:24 2025 -0400
Removing lombok annotations
Starting with a few easy getters/setter annotations, and a few lesser used classes with @Data
---
.../scim/core/repository/PatchHandlerTest.java | 8 +-
.../server/configuration/ServerConfiguration.java | 168 ++++++++++++++++++++-
.../directory/scim/protocol/ErrorMessageType.java | 14 +-
.../scim/spec/patch/PatchOperationPath.java | 5 +-
.../scim/spec/patch/PatchPathListener.java | 6 +-
.../directory/scim/spec/resources/PhoneNumber.java | 78 +++++++---
.../apache/directory/scim/spec/schema/Schema.java | 21 +--
.../directory/scim/spec/schema/ScimSpecSchema.java | 15 +-
8 files changed, 257 insertions(+), 58 deletions(-)
diff --git a/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java b/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
index f46dc8bd..07679543 100644
--- a/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
+++ b/scim-core/src/test/java/org/apache/directory/scim/core/repository/PatchHandlerTest.java
@@ -19,7 +19,6 @@
package org.apache.directory.scim.core.repository;
-import lombok.SneakyThrows;
import org.apache.directory.scim.core.schema.SchemaRegistry;
import org.apache.directory.scim.spec.extension.EnterpriseExtension;
import org.apache.directory.scim.spec.filter.FilterParseException;
@@ -676,12 +675,15 @@ public class PatchHandlerTest {
));
}
- @SneakyThrows
private PatchOperation patchOperation(Type operationType, String path, Object value) {
PatchOperation op = new PatchOperation();
op.setOperation(operationType);
if (path != null) {
- op.setPath(PatchOperationPath.fromString(path));
+ try {
+ op.setPath(PatchOperationPath.fromString(path));
+ } catch (FilterParseException e) {
+ throw new RuntimeException("Failed to parse Operation path in test", e);
+ }
}
if (value != null) {
op.setValue(value);
diff --git a/scim-server/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java b/scim-server/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java
index 4296b253..6761cc6a 100644
--- a/scim-server/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java
+++ b/scim-server/src/main/java/org/apache/directory/scim/server/configuration/ServerConfiguration.java
@@ -23,9 +23,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.Setter;
import org.apache.directory.scim.spec.schema.ServiceProviderConfiguration.AuthenticationSchema;
import org.apache.directory.scim.spec.schema.ServiceProviderConfiguration.BulkConfiguration;
import org.apache.directory.scim.spec.schema.ServiceProviderConfiguration.FilterConfiguration;
@@ -37,7 +34,6 @@ import org.apache.directory.scim.spec.schema.ServiceProviderConfiguration.Suppor
*
* @author Chris Harm <crh5255@psu.edu>
*/
-@Data
public class ServerConfiguration {
static final int BULK_MAXIMUM_OPERATIONS = 100;
@@ -49,25 +45,21 @@ public class ServerConfiguration {
boolean supportsChangePassword = false;
- @Setter(AccessLevel.NONE)
boolean supportsBulk = true;
int bulkMaxOperations = BULK_MAXIMUM_OPERATIONS;
int bulkMaxPayloadSize = BULK_MAXIMUM_PAYLOAD_SIZE; //TODO what should this be?
- @Setter(AccessLevel.NONE)
boolean supportsETag = true;
boolean supportsFilter = false;
int filterMaxResults = FILTER_MAXIMUM_RESULTS;
- @Setter(AccessLevel.NONE)
boolean supportsPatch = true;
boolean supportsSort = false;
String documentationUri;
- @Setter(AccessLevel.NONE)
List<AuthenticationSchema> authenticationSchemas = new ArrayList<>();
public List<AuthenticationSchema> getAuthenticationSchemas() {
@@ -119,4 +111,164 @@ public class ServerConfiguration {
return supportedConfiguration;
}
+ public String getId() {
+ return this.id;
+ }
+
+ public ServerConfiguration setId(String id) {
+ this.id = id;
+ return this;
+ }
+
+ public boolean isSupportsChangePassword() {
+ return this.supportsChangePassword;
+ }
+
+ public ServerConfiguration setSupportsChangePassword(boolean supportsChangePassword) {
+ this.supportsChangePassword = supportsChangePassword;
+ return this;
+ }
+
+ public boolean isSupportsBulk() {
+ return this.supportsBulk;
+ }
+
+ public ServerConfiguration setSupportsBulk(boolean supportsBulk) {
+ this.supportsBulk = supportsBulk;
+ return this;
+ }
+
+ public int getBulkMaxOperations() {
+ return this.bulkMaxOperations;
+ }
+
+ public ServerConfiguration setBulkMaxOperations(int bulkMaxOperations) {
+ this.bulkMaxOperations = bulkMaxOperations;
+ return this;
+ }
+
+ public int getBulkMaxPayloadSize() {
+ return this.bulkMaxPayloadSize;
+ }
+
+ public ServerConfiguration setBulkMaxPayloadSize(int bulkMaxPayloadSize) {
+ this.bulkMaxPayloadSize = bulkMaxPayloadSize;
+ return this;
+ }
+
+ public boolean isSupportsETag() {
+ return this.supportsETag;
+ }
+
+ public ServerConfiguration setSupportsETag(boolean supportsETag) {
+ this.supportsETag = supportsETag;
+ return this;
+ }
+
+ public boolean isSupportsFilter() {
+ return this.supportsFilter;
+ }
+
+ public ServerConfiguration setSupportsFilter(boolean supportsFilter) {
+ this.supportsFilter = supportsFilter;
+ return this;
+ }
+
+ public int getFilterMaxResults() {
+ return this.filterMaxResults;
+ }
+
+ public ServerConfiguration setFilterMaxResults(int filterMaxResults) {
+ this.filterMaxResults = filterMaxResults;
+ return this;
+ }
+
+ public boolean isSupportsPatch() {
+ return this.supportsPatch;
+ }
+
+ public ServerConfiguration setSupportsPatch(boolean supportsPatch) {
+ this.supportsPatch = supportsPatch;
+ return this;
+ }
+
+ public boolean isSupportsSort() {
+ return this.supportsSort;
+ }
+
+ public ServerConfiguration setSupportsSort(boolean supportsSort) {
+ this.supportsSort = supportsSort;
+ return this;
+ }
+
+ public String getDocumentationUri() {
+ return this.documentationUri;
+ }
+
+ public ServerConfiguration setAuthenticationSchemas(List<AuthenticationSchema> authenticationSchemas) {
+ this.authenticationSchemas = authenticationSchemas;
+ return this;
+ }
+
+ public ServerConfiguration setDocumentationUri(String documentationUri) {
+ this.documentationUri = documentationUri;
+ return this;
+ }
+
+ public boolean equals(final Object o) {
+ if (o == this) return true;
+ if (!(o instanceof ServerConfiguration)) return false;
+ final ServerConfiguration other = (ServerConfiguration) o;
+ if (!other.canEqual((Object) this)) return false;
+ final Object this$id = this.getId();
+ final Object other$id = other.getId();
+ if (this$id == null ? other$id != null : !this$id.equals(other$id)) return false;
+ if (this.isSupportsChangePassword() != other.isSupportsChangePassword()) return false;
+ if (this.isSupportsBulk() != other.isSupportsBulk()) return false;
+ if (this.getBulkMaxOperations() != other.getBulkMaxOperations()) return false;
+ if (this.getBulkMaxPayloadSize() != other.getBulkMaxPayloadSize()) return false;
+ if (this.isSupportsETag() != other.isSupportsETag()) return false;
+ if (this.isSupportsFilter() != other.isSupportsFilter()) return false;
+ if (this.getFilterMaxResults() != other.getFilterMaxResults()) return false;
+ if (this.isSupportsPatch() != other.isSupportsPatch()) return false;
+ if (this.isSupportsSort() != other.isSupportsSort()) return false;
+ final Object this$documentationUri = this.getDocumentationUri();
+ final Object other$documentationUri = other.getDocumentationUri();
+ if (this$documentationUri == null ? other$documentationUri != null : !this$documentationUri.equals(other$documentationUri))
+ return false;
+ final Object this$authenticationSchemas = this.getAuthenticationSchemas();
+ final Object other$authenticationSchemas = other.getAuthenticationSchemas();
+ if (this$authenticationSchemas == null ? other$authenticationSchemas != null : !this$authenticationSchemas.equals(other$authenticationSchemas))
+ return false;
+ return true;
+ }
+
+ protected boolean canEqual(final Object other) {
+ return other instanceof ServerConfiguration;
+ }
+
+ public int hashCode() {
+ final int PRIME = 59;
+ int result = 1;
+ final Object $id = this.getId();
+ result = result * PRIME + ($id == null ? 43 : $id.hashCode());
+ result = result * PRIME + (this.isSupportsChangePassword() ? 79 : 97);
+ result = result * PRIME + (this.isSupportsBulk() ? 79 : 97);
+ result = result * PRIME + this.getBulkMaxOperations();
+ result = result * PRIME + this.getBulkMaxPayloadSize();
+ result = result * PRIME + (this.isSupportsETag() ? 79 : 97);
+ result = result * PRIME + (this.isSupportsFilter() ? 79 : 97);
+ result = result * PRIME + this.getFilterMaxResults();
+ result = result * PRIME + (this.isSupportsPatch() ? 79 : 97);
+ result = result * PRIME + (this.isSupportsSort() ? 79 : 97);
+ final Object $documentationUri = this.getDocumentationUri();
+ result = result * PRIME + ($documentationUri == null ? 43 : $documentationUri.hashCode());
+ final Object $authenticationSchemas = this.getAuthenticationSchemas();
+ result = result * PRIME + ($authenticationSchemas == null ? 43 : $authenticationSchemas.hashCode());
+ return result;
+ }
+
+ public String toString() {
+ return "ServerConfiguration(id=" + this.getId() + ", supportsChangePassword=" + this.isSupportsChangePassword() + ", supportsBulk=" + this.isSupportsBulk() + ", bulkMaxOperations=" + this.getBulkMaxOperations() + ", bulkMaxPayloadSize=" + this.getBulkMaxPayloadSize() + ", supportsETag=" + this.isSupportsETag() + ", supportsFilter=" + this.isSupportsFilter() + ", filterMaxResults=" + this.getFilterMaxResults() + ", supportsPatch=" + this.isSupportsPatch() + ", supportsSort=" + this.is [...]
+ }
}
diff --git a/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/protocol/ErrorMessageType.java b/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/protocol/ErrorMessageType.java
index 0d15b5cb..7496fbe2 100644
--- a/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/protocol/ErrorMessageType.java
+++ b/scim-spec/scim-spec-protocol/src/main/java/org/apache/directory/scim/protocol/ErrorMessageType.java
@@ -22,11 +22,7 @@ package org.apache.directory.scim.protocol;
import jakarta.xml.bind.annotation.XmlEnum;
import jakarta.xml.bind.annotation.XmlEnumValue;
-import lombok.AccessLevel;
-import lombok.Getter;
-
-@XmlEnum(String.class)
-@Getter(AccessLevel.PUBLIC)
+@XmlEnum
public enum ErrorMessageType {
//HTTP 400 Error messages (SCIM Protocol Specification, section 3.12, page 69)
@@ -78,4 +74,12 @@ public enum ErrorMessageType {
this.scimType = scimType;
this.detail = detail;
}
+
+ public String getScimType() {
+ return this.scimType;
+ }
+
+ public String getDetail() {
+ return this.detail;
+ }
}
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchOperationPath.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchOperationPath.java
index 8552ce07..8ba7e5ca 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchOperationPath.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchOperationPath.java
@@ -20,7 +20,6 @@
package org.apache.directory.scim.spec.patch;
import lombok.EqualsAndHashCode;
-import lombok.Getter;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
@@ -41,7 +40,6 @@ public class PatchOperationPath implements Serializable {
private static final long serialVersionUID = 449365558879593512L;
- @Getter
private final ValuePathExpression valuePathExpression;
public PatchOperationPath(ValuePathExpression valuePathExpression) {
@@ -80,4 +78,7 @@ public class PatchOperationPath implements Serializable {
return new PatchOperationPath(parsePatchPath(patchPath));
}
+ public ValuePathExpression getValuePathExpression() {
+ return this.valuePathExpression;
+ }
}
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchPathListener.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchPathListener.java
index 283d2f1e..031aa866 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchPathListener.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/patch/PatchPathListener.java
@@ -25,9 +25,7 @@ import org.apache.directory.scim.spec.filter.attribute.AttributeReference;
import org.apache.directory.scim.spec.filter.ExpressionBuildingListener;
import org.apache.directory.scim.spec.filter.FilterExpression;
import org.apache.directory.scim.spec.filter.ValuePathExpression;
-import lombok.Getter;
-@Getter
public class PatchPathListener extends ExpressionBuildingListener {
private ValuePathExpression valuePathExpression;
@@ -61,4 +59,8 @@ public class PatchPathListener extends ExpressionBuildingListener {
this.valuePathExpression = new ValuePathExpression(attributePath);
}
+
+ public ValuePathExpression getValuePathExpression() {
+ return this.valuePathExpression;
+ }
}
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 9621d5c7..4ced5eeb 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
@@ -48,10 +48,7 @@ import org.apache.directory.scim.spec.phonenumber.PhoneNumberLexer;
import org.apache.directory.scim.spec.phonenumber.PhoneNumberParseException;
import org.apache.directory.scim.spec.phonenumber.PhoneNumberParseTreeListener;
import org.apache.directory.scim.spec.phonenumber.PhoneNumberParser;
-import lombok.AccessLevel;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
/**
* Scim core schema, <a
@@ -75,48 +72,28 @@ public class PhoneNumber implements Serializable, TypedAttribute {
@XmlElement
@ScimAttribute(description = "A human readable name, primarily used for display purposes. READ-ONLY.")
- @Getter
- @Setter
String display;
@XmlElement
@ScimAttribute(canonicalValueList = { "work", "home", "mobile", "fax", "pager", "other" }, description = "A label indicating the attribute's function; e.g., 'work' or 'home' or 'mobile' etc.")
- @Getter
- @Setter
String type;
@XmlElement
@ScimAttribute(description = "A Boolean value indicating the 'primary' or preferred attribute value for this attribute, e.g. the preferred phone number or primary phone number. The primary attribute value 'true' MUST appear no more than once.")
- @Getter
- @Setter
Boolean primary = false;
- @Setter(AccessLevel.NONE)
- @Getter
boolean isGlobalNumber = false;
- @Getter
- @Setter(AccessLevel.NONE)
String number;
- @Setter(AccessLevel.NONE)
- @Getter
String extension;
- @Setter(AccessLevel.NONE)
- @Getter
String subAddress;
- @Setter(AccessLevel.NONE)
- @Getter
String phoneContext;
- @Setter(AccessLevel.NONE)
- @Getter
boolean isDomainPhoneContext = false;
- @Getter
- @Setter(AccessLevel.NONE)
Map<String, String> params;
public void addParam(String name, String value) {
@@ -176,6 +153,61 @@ public class PhoneNumber implements Serializable, TypedAttribute {
return this;
}
+ public String getDisplay() {
+ return this.display;
+ }
+
+ public PhoneNumber setDisplay(String display) {
+ this.display = display;
+ return this;
+ }
+
+ public String getType() {
+ return this.type;
+ }
+
+ public PhoneNumber setType(String type) {
+ this.type = type;
+ return this;
+ }
+
+ public Boolean getPrimary() {
+ return this.primary;
+ }
+
+ public PhoneNumber setPrimary(Boolean primary) {
+ this.primary = primary;
+ return this;
+ }
+
+ public String getNumber() {
+ return this.number;
+ }
+
+ public String getExtension() {
+ return this.extension;
+ }
+
+ public String getSubAddress() {
+ return this.subAddress;
+ }
+
+ public String getPhoneContext() {
+ return this.phoneContext;
+ }
+
+ public boolean isDomainPhoneContext() {
+ return this.isDomainPhoneContext;
+ }
+
+ public Map<String, String> getParams() {
+ return this.params;
+ }
+
+ public boolean isGlobalNumber() {
+ return this.isGlobalNumber;
+ }
+
/*
* Implements RFC 3996 URI Equality for the value property
* https://tools.ietf.org/html/rfc3966#section-3
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/Schema.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/Schema.java
index 764a4e34..6daf0d90 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/Schema.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/Schema.java
@@ -23,7 +23,8 @@ import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import jakarta.xml.bind.annotation.*;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.directory.scim.spec.exception.ScimResourceInvalidException;
import org.apache.directory.scim.spec.validator.Urn;
import org.slf4j.Logger;
@@ -67,6 +68,15 @@ public class Schema implements AttributeContainer {
private static final long serialVersionUID = 1683400114899587851L;
+ String getPath() {
+ return this.path;
+ }
+
+ Attribute setPath(String path) {
+ this.path = path;
+ return this;
+ }
+
public enum Mutability {
@XmlEnumValue("immutable") IMMUTABLE,
@@ -117,15 +127,10 @@ public class Schema implements AttributeContainer {
String schemaUrn;
- @Getter(AccessLevel.PACKAGE)
- @Setter(AccessLevel.PACKAGE)
String path;
@XmlElement
Set<Attribute> subAttributes;
-
- @Getter(AccessLevel.NONE)
- @Setter(AccessLevel.NONE)
Map<String, Attribute> subAttributeNamesMap = new HashMap<>();
@XmlElement
@@ -218,9 +223,7 @@ public class Schema implements AttributeContainer {
@XmlElement
@XmlElementWrapper(name = "attributes")
Set<Attribute> attributes;
-
- @Getter(AccessLevel.NONE)
- @Setter(AccessLevel.NONE)
+
Map<String, Attribute> attributeNamesMap = new HashMap<>();
@XmlElement
diff --git a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/ScimSpecSchema.java b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/ScimSpecSchema.java
index 1d33ea0d..a821fc32 100644
--- a/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/ScimSpecSchema.java
+++ b/scim-spec/scim-spec-schema/src/main/java/org/apache/directory/scim/spec/schema/ScimSpecSchema.java
@@ -21,13 +21,12 @@ package org.apache.directory.scim.spec.schema;
import java.util.Set;
-import lombok.Data;
-import lombok.Getter;
-
-@Data
+@Deprecated
+/**
+ * @deprecated will be removed in the near future, use {@link org.apache.directory.scim.core.schema.SchemaRegistry SchemaRegistry} instead.
+ */
public class ScimSpecSchema {
-
- @Getter
+
final static Set<String> schemaNames = Set.of(
"urn:ietf:params:scim:schemas:core:2.0:Group",
"urn:ietf:params:scim:schemas:core:2.0:ResourceType",
@@ -35,4 +34,8 @@ public class ScimSpecSchema {
"urn:ietf:params:scim:schemas:core:2.0:User",
"urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"
);
+
+ public static Set<String> getSchemaNames() {
+ return schemaNames;
+ }
}