Skip to content

Commit

Permalink
re-formatted to google java style and updated copyright to 2019 (#1480)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfecher committed Jan 4, 2019
1 parent b8eb97e commit b732aef
Show file tree
Hide file tree
Showing 1,963 changed files with 210,993 additions and 270,110 deletions.
2 changes: 1 addition & 1 deletion .utility/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if [ "$IT_ONLY" == "true" ]; then
mvn -q verify -am -pl test -Dtest=SkipUnitTests -DfailIfNoTests=false -P $MAVEN_PROFILES
else
echo -e "Running unit tests only w/ verify...\n"
mvn -q verify -am -pl test -P $MAVEN_PROFILES
mvn -q verify -Dfmt.action=validate -P $MAVEN_PROFILES
fi
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Copyright 2017-2018 Radiant Solutions
Copyright 2017-2019 Radiant Solutions
Copyright 2013-2016 RadiantBlue Technologies
Copyright 2016-2017 DigitalGlobe, Inc.
Copyright 2013-2017 Booz Allen Hamilton
Copyright 2010 Lars Francke – RE: OsmAvro.avsc
Copyright 2013-2106 Commonwealth Computer Research, Inc. RE: XZOrderSFC.java
Copyright 2013-2016 Commonwealth Computer Research, Inc. RE: XZOrderSFC.java
Copyright 2014 GeoSolutions RE: WarpNearestOpImage.java

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,127 +1,112 @@
/*******************************************************************************
* Copyright (c) 2013-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Apache License,
* Version 2.0 which accompanies this distribution and is available at
* http://www.apache.org/licenses/LICENSE-2.0.txt
******************************************************************************/
/**
* Copyright (c) 2013-2019 Contributors to the Eclipse Foundation
*
* <p> See the NOTICE file distributed with this work for additional information regarding copyright
* ownership. All rights reserved. This program and the accompanying materials are made available
* under the terms of the Apache License, Version 2.0 which accompanies this distribution and is
* available at http://www.apache.org/licenses/LICENSE-2.0.txt
*/
package org.locationtech.geowave.analytic;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.hadoop.io.ObjectWritable;
import org.apache.hadoop.io.Writable;
import org.locationtech.geowave.core.index.ByteArray;
import org.locationtech.geowave.mapreduce.HadoopWritableSerializationTool;

public class AdapterWithObjectWritable implements
Writable
{
private ObjectWritable objectWritable;
private Short internalAdapterId = null;
private ByteArray dataId;

public void setObject(
final ObjectWritable data ) {
objectWritable = data;
}

public ObjectWritable getObjectWritable() {
return objectWritable;
}

protected void setObjectWritable(
final ObjectWritable objectWritable ) {
this.objectWritable = objectWritable;
}

public Short getInternalAdapterId() {
return internalAdapterId;
}

public void setInternalAdapterId(
final short internalAdapterId ) {
this.internalAdapterId = internalAdapterId;
}

public ByteArray getDataId() {
return dataId;
}

public void setDataId(
final ByteArray dataId ) {
this.dataId = dataId;
}

@Override
public void readFields(
final DataInput input )
throws IOException {
internalAdapterId = input.readShort();
final int dataIdLength = input.readUnsignedShort();
if (dataIdLength > 0) {
final byte[] dataIdBinary = new byte[dataIdLength];
input.readFully(dataIdBinary);
dataId = new ByteArray(
dataIdBinary);
}

if (objectWritable == null) {
objectWritable = new ObjectWritable();
}
objectWritable.readFields(input);
}

@Override
public void write(
final DataOutput output )
throws IOException {
output.writeShort(internalAdapterId);
if (dataId != null) {
final byte[] dataIdBinary = dataId.getBytes();
output.writeShort((short) dataIdBinary.length);
output.write(dataIdBinary);
}
else {
output.writeShort(0);
}

objectWritable.write(output);

}

public static void fillWritableWithAdapter(
final HadoopWritableSerializationTool serializationTool,
final AdapterWithObjectWritable writableToFill,
final short internalAdapterId,
final ByteArray dataId,
final Object entry ) {
writableToFill.setInternalAdapterId(internalAdapterId);
writableToFill.setDataId(dataId);
writableToFill.setObject(serializationTool.toWritable(
internalAdapterId,
entry));
}

public static Object fromWritableWithAdapter(
final HadoopWritableSerializationTool serializationTool,
final AdapterWithObjectWritable writableToExtract ) {
final short internalAdapterId = writableToExtract.getInternalAdapterId();
final Object innerObj = writableToExtract.objectWritable.get();
return (innerObj instanceof Writable) ? serializationTool.getHadoopWritableSerializerForAdapter(
internalAdapterId).fromWritable(
(Writable) innerObj) : innerObj;
}

@Override
public String toString() {
return "AdapterWithObjectWritable [ internalAdapterId=" + internalAdapterId + ", dataId=" + dataId.getString()
+ "]";
}

public class AdapterWithObjectWritable implements Writable {
private ObjectWritable objectWritable;
private Short internalAdapterId = null;
private ByteArray dataId;

public void setObject(final ObjectWritable data) {
objectWritable = data;
}

public ObjectWritable getObjectWritable() {
return objectWritable;
}

protected void setObjectWritable(final ObjectWritable objectWritable) {
this.objectWritable = objectWritable;
}

public Short getInternalAdapterId() {
return internalAdapterId;
}

public void setInternalAdapterId(final short internalAdapterId) {
this.internalAdapterId = internalAdapterId;
}

public ByteArray getDataId() {
return dataId;
}

public void setDataId(final ByteArray dataId) {
this.dataId = dataId;
}

@Override
public void readFields(final DataInput input) throws IOException {
internalAdapterId = input.readShort();
final int dataIdLength = input.readUnsignedShort();
if (dataIdLength > 0) {
final byte[] dataIdBinary = new byte[dataIdLength];
input.readFully(dataIdBinary);
dataId = new ByteArray(dataIdBinary);
}

if (objectWritable == null) {
objectWritable = new ObjectWritable();
}
objectWritable.readFields(input);
}

@Override
public void write(final DataOutput output) throws IOException {
output.writeShort(internalAdapterId);
if (dataId != null) {
final byte[] dataIdBinary = dataId.getBytes();
output.writeShort((short) dataIdBinary.length);
output.write(dataIdBinary);
} else {
output.writeShort(0);
}

objectWritable.write(output);
}

public static void fillWritableWithAdapter(
final HadoopWritableSerializationTool serializationTool,
final AdapterWithObjectWritable writableToFill,
final short internalAdapterId,
final ByteArray dataId,
final Object entry) {
writableToFill.setInternalAdapterId(internalAdapterId);
writableToFill.setDataId(dataId);
writableToFill.setObject(serializationTool.toWritable(internalAdapterId, entry));
}

public static Object fromWritableWithAdapter(
final HadoopWritableSerializationTool serializationTool,
final AdapterWithObjectWritable writableToExtract) {
final short internalAdapterId = writableToExtract.getInternalAdapterId();
final Object innerObj = writableToExtract.objectWritable.get();
return (innerObj instanceof Writable)
? serializationTool.getHadoopWritableSerializerForAdapter(internalAdapterId).fromWritable(
(Writable) innerObj)
: innerObj;
}

@Override
public String toString() {
return "AdapterWithObjectWritable [ internalAdapterId="
+ internalAdapterId
+ ", dataId="
+ dataId.getString()
+ "]";
}
}
Loading

0 comments on commit b732aef

Please sign in to comment.