Skip to content

Commit

Permalink
Add test-support to build
Browse files Browse the repository at this point in the history
Issue gh-610
  • Loading branch information
jzheaux committed Jan 13, 2022
1 parent d89836d commit 53ae532
Show file tree
Hide file tree
Showing 4 changed files with 189 additions and 5 deletions.
2 changes: 2 additions & 0 deletions dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {
api "commons-pool:commons-pool:1.6"
api "org.apache.commons:commons-pool2:2.4.2"
api "ch.qos.logback:logback-classic:1.2.6"
api "com.google.code.typica:typica:1.3"
api "com.google.inject:guice:3.0"
api "com.nimbusds:nimbus-jose-jwt:9.14"
api "com.nimbusds:oauth2-oidc-sdk:9.18"
Expand All @@ -45,6 +46,7 @@ dependencies {
api "jakarta.servlet:jakarta.servlet-api:5.0.0"
api "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1"
api "jakarta.persistence:jakarta.persistence-api:3.0.0"
api "javax.activation:activation:1.1"
api "ldapsdk:ldapsdk:4.1"
api "net.sourceforge.htmlunit:htmlunit:2.54.0"
api "net.sourceforge.nekohtml:nekohtml:1.9.22"
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ rootProject.name = 'spring-ldap'
include 'core'
include 'core-tiger'
include 'dependencies'
//include 'test-support'
include 'test-support'
include 'ldif/ldif-core'
//include 'odm'
////include 'sandbox'
Expand All @@ -50,4 +50,4 @@ rootProject.children.each { p->
p.name = "spring-ldap-" + name
}

//findProject(":spring-ldap-test-support").name = "spring-ldap-test"
findProject(":spring-ldap-test-support").name = "spring-ldap-test"
15 changes: 12 additions & 3 deletions test-support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,28 @@ plugins {
}

dependencies {
management platform(project(":spring-ldap-dependencies"))
implementation project(":spring-ldap-core"),
project(":spring-ldap-ldif-core"),
"com.google.code.typica:typica:1.3",
"com.google.code.typica:typica",
"commons-io:commons-io",
"javax.activation:activation:1.1",
"javax.activation:activation",
"org.springframework:spring-core",
"org.springframework:spring-beans",
"org.springframework:spring-context",
"org.springframework:spring-test"


optional apachedsDependencies
optional "org.apache.directory.server:apacheds-core-entry"
optional "org.apache.directory.server:apacheds-core"
optional "org.apache.directory.server:apacheds-protocol-ldap"
optional "org.apache.directory.server:apacheds-protocol-shared"
optional "org.apache.directory.server:apacheds-server-jndi"
optional "org.apache.directory.shared:shared-ldap"
optional "com.unboundid:unboundid-ldapsdk"

provided "junit:junit"
testImplementation platform('org.junit:junit-bom')
testImplementation "org.junit.vintage:junit-vintage-engine"
testImplementation "org.assertj:assertj-core"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
/*
* Copyright 2002-2021 the original author or authors.
*
* Licensed 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
*
* https://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.server.core.avltree;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Comparator;

import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Class to serialize the Array data.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
@SuppressWarnings("unchecked")
public class ArrayMarshaller<E> implements Marshaller<ArrayTree<E>> {

/** static logger */
private static final Logger LOG = LoggerFactory.getLogger(ArrayMarshaller.class);

/** used for serialized form of an empty AvlTree */
private static final byte[] EMPTY_TREE = new byte[1];

/** marshaller to be used for marshalling the keys */
private Marshaller<E> keyMarshaller;

/** key Comparator for the AvlTree */
private Comparator<E> comparator;

/**
* Creates a new instance of AvlTreeMarshaller with a custom key Marshaller.
* @param comparator Comparator to be used for key comparision
* @param keyMarshaller marshaller for keys
*/
public ArrayMarshaller(Comparator<E> comparator, Marshaller<E> keyMarshaller) {
this.comparator = comparator;
this.keyMarshaller = keyMarshaller;
}

/**
* Creates a new instance of AvlTreeMarshaller with the default key Marshaller which
* uses Java Serialization.
* @param comparator Comparator to be used for key comparision
*/
public ArrayMarshaller(Comparator<E> comparator) {
this.comparator = comparator;
this.keyMarshaller = DefaultMarshaller.INSTANCE;
}

/**
* Marshals the given tree to bytes
* @param tree the tree to be marshalled
*/
public byte[] serialize(ArrayTree<E> tree) {
if ((tree == null) || (tree.size() == 0)) {
return EMPTY_TREE;
}

ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(byteStream);
byte[] data = null;

try {
out.writeByte(0); // represents the start of an Array byte stream
out.writeInt(tree.size());

for (int position = 0; position < tree.size(); position++) {
E value = tree.get(position);
byte[] bytes = this.keyMarshaller.serialize(value);

// Write the key length
out.writeInt(bytes.length);

// Write the key if its length is not null
if (bytes.length != 0) {
out.write(bytes);
}
}

out.flush();
data = byteStream.toByteArray();

// Try to deserialize, just to see
try {
deserialize(data);
}
catch (NullPointerException npe) {
System.out.println("Bad serialization, tree : [" + StringTools.dumpBytes(data) + "]");
throw npe;
}

out.close();
}
catch (IOException ex) {
ex.printStackTrace();
}

return data;
}

/**
* Creates an Array from given bytes of data.
* @param data byte array to be converted into an array
*/
public ArrayTree<E> deserialize(byte[] data) throws IOException {
try {
if ((data == null) || (data.length == 0)) {
throw new IOException("Null or empty data array is invalid.");
}

if ((data.length == 1) && (data[0] == 0)) {
E[] array = (E[]) new Object[] {};
ArrayTree<E> tree = new ArrayTree<E>(this.comparator, array);
return tree;
}

ByteArrayInputStream bin = new ByteArrayInputStream(data);
DataInputStream din = new DataInputStream(bin);

byte startByte = din.readByte();

if (startByte != 0) {
throw new IOException("wrong array serialized data format");
}

int size = din.readInt();
E[] nodes = (E[]) new Object[size];

for (int i = 0; i < size; i++) {
// Read the object's size
int dataSize = din.readInt();

if (dataSize != 0) {
byte[] bytes = new byte[dataSize];

din.read(bytes);
E key = this.keyMarshaller.deserialize(bytes);
nodes[i] = key;
}
}

ArrayTree<E> arrayTree = new ArrayTree<E>(this.comparator, nodes);

return arrayTree;
}
catch (NullPointerException npe) {
System.out.println("Bad tree : [" + StringTools.dumpBytes(data) + "]");
throw npe;
}
}

}

0 comments on commit 53ae532

Please sign in to comment.