diff --git a/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/businesscard/PDExtendedBusinessCard.java b/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/businesscard/PDExtendedBusinessCard.java index 22baab2f..192b851c 100644 --- a/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/businesscard/PDExtendedBusinessCard.java +++ b/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/businesscard/PDExtendedBusinessCard.java @@ -112,14 +112,17 @@ public IJsonObject getAsJson () final IJsonObject ret = new JsonObject (); ret.addJson ("businesscard", m_aBusinessCard.getAsJson ()); ret.addJson ("doctypes", - new JsonArray ().addAllMapped (m_aDocumentTypeIDs, x -> PDIdentifier.getAsJson (x.getScheme (), x.getValue ()))); + new JsonArray ().addAllMapped (m_aDocumentTypeIDs, + x -> PDIdentifier.getAsJson (x.getScheme (), x.getValue ()))); return ret; } @Override public String toString () { - return new ToStringGenerator (this).append ("BusinessCard", m_aBusinessCard).append ("DocTypeIDs", m_aDocumentTypeIDs).getToString (); + return new ToStringGenerator (this).append ("BusinessCard", m_aBusinessCard) + .append ("DocTypeIDs", m_aDocumentTypeIDs) + .getToString (); } @Nonnull diff --git a/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/rest/IndexerResource.java b/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/rest/IndexerResource.java index 8b3c2bf0..ad2b70ec 100644 --- a/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/rest/IndexerResource.java +++ b/phoss-directory-indexer/src/main/java/com/helger/pd/indexer/rest/IndexerResource.java @@ -106,8 +106,9 @@ public Response createOrUpdateParticipant (@Context @Nonnull final HttpServletRe @Nonnull final String sParticipantID) { final String sLogPrefix = "[createOrUpdateParticipant] "; - final ClientCertificateValidationResult aResult = _checkClientCertificate (aHttpServletRequest, sLogPrefix); - if (aResult.isFailure ()) + final ClientCertificateValidationResult aCertValidationResult = _checkClientCertificate (aHttpServletRequest, + sLogPrefix); + if (aCertValidationResult.isFailure ()) return Response.status (Response.Status.FORBIDDEN).build (); final String sRealParticipantID = _unifyPID (sParticipantID); @@ -126,7 +127,7 @@ public Response createOrUpdateParticipant (@Context @Nonnull final HttpServletRe if (PDMetaManager.getIndexerMgr () .queueWorkItem (aPI, EIndexerWorkItemType.CREATE_UPDATE, - aResult.getClientID (), + aCertValidationResult.getClientID (), _getRequestingHost (aHttpServletRequest)) .isUnchanged ()) { @@ -142,8 +143,9 @@ public Response deleteParticipant (@Context @Nonnull final HttpServletRequest aH @PathParam ("participantID") @Nonnull final String sParticipantID) { final String sLogPrefix = "[deleteParticipant] "; - final ClientCertificateValidationResult aResult = _checkClientCertificate (aHttpServletRequest, sLogPrefix); - if (aResult.isFailure ()) + final ClientCertificateValidationResult aCertValidationResult = _checkClientCertificate (aHttpServletRequest, + sLogPrefix); + if (aCertValidationResult.isFailure ()) return Response.status (Response.Status.FORBIDDEN).build (); final String sRealParticipantID = _unifyPID (sParticipantID); @@ -165,7 +167,7 @@ public Response deleteParticipant (@Context @Nonnull final HttpServletRequest aH if (PDMetaManager.getIndexerMgr () .queueWorkItem (aPI, EIndexerWorkItemType.DELETE, - aResult.getClientID (), + aCertValidationResult.getClientID (), _getRequestingHost (aHttpServletRequest)) .isUnchanged ()) {