Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
Release: com.io7m.jbssio 1.0.0
Change: Initial public release
  • Loading branch information
io7m committed Nov 25, 2020
2 parents 5496351 + 8cabcef commit cbb651b
Show file tree
Hide file tree
Showing 30 changed files with 246 additions and 127 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/main-openjdk_current-linux.yml
@@ -0,0 +1,19 @@
name: main-openjdk_current-linux

on:
push:
branches: [ develop, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: JDK
uses: actions/setup-java@v1
with:
java-version: 15
- name: Build
run: mvn --errors clean verify site
19 changes: 19 additions & 0 deletions .github/workflows/main-openjdk_current-windows.yml
@@ -0,0 +1,19 @@
name: main-openjdk_current-windows

on:
push:
branches: [ develop, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: JDK
uses: actions/setup-java@v1
with:
java-version: 15
- name: Build
run: mvn --errors clean verify site
23 changes: 23 additions & 0 deletions .github/workflows/main-openjdk_lts-linux.yml
@@ -0,0 +1,23 @@
name: main-openjdk_lts-linux

on:
push:
branches: [ develop, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build
run: mvn --errors clean verify site
- name: Coverage
uses: codecov/codecov-action@v1
with:
file: com.io7m.blackthorne.tests/target/site/jacoco/jacoco.xml
2 changes: 1 addition & 1 deletion .jenkins
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

8 changes: 7 additions & 1 deletion README-CHANGES.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<c:changelog project="com.io7m.jbssio" xmlns:c="urn:com.io7m.changelog:4.0">
<c:releases/>
<c:releases>
<c:release date="2020-11-25T20:09:47+00:00" ticket-system="com.github.io7m.jbssio" version="1.0.0">
<c:changes>
<c:change date="2020-11-25T20:09:47+00:00" summary="Initial public release"/>
</c:changes>
</c:release>
</c:releases>
<c:ticket-systems>
<c:ticket-system default="true" id="com.github.io7m.jbssio" url="https://www.github.com/io7m/jbssio/issues/"/>
</c:ticket-systems>
Expand Down
11 changes: 8 additions & 3 deletions README.md
@@ -1,10 +1,15 @@
jbssio
============
===

[![Build Status](https://img.shields.io/travis/io7m/jbssio.svg?style=flat-square)](https://travis-ci.org/io7m/jbssio)
[![Maven Central](https://img.shields.io/maven-central/v/com.io7m.jbssio/com.io7m.jbssio.svg?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.jbssio%22)
[![Maven Central (snapshot)](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.io7m.jbssio/com.io7m.jbssio.svg?style=flat-square)](https://oss.sonatype.org/content/repositories/snapshots/com/io7m/jbssio/)
[![Codacy Badge](https://img.shields.io/codacy/grade/d001af00668a48e4a9196dea0afe0e8f.svg?style=flat-square)](https://www.codacy.com/app/github_79/jbssio?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=io7m/jbssio&amp;utm_campaign=Badge_Grade)
[![Codecov](https://img.shields.io/codecov/c/github/io7m/jbssio.svg?style=flat-square)](https://codecov.io/gh/io7m/jbssio)

![jbssio](./src/site/resources/jbssio.jpg?raw=true)

| JVM | Platform | Status |
|-----------------|----------|--------|
| OpenJDK LTS | Linux | [![Build (OpenJDK LTS, Linux)](https://img.shields.io/github/workflow/status/io7m/jbssio/main-openjdk_lts-linux)](https://github.com/io7m/jbssio/actions?query=workflow%3Amain-openjdk_lts-linux) |
| OpenJDK Current | Linux | [![Build (OpenJDK Current, Linux)](https://img.shields.io/github/workflow/status/io7m/jbssio/main-openjdk_current-linux)](https://github.com/io7m/jbssio/actions?query=workflow%3Amain-openjdk_current-linux)
| OpenJDK Current | Windows | [![Build (OpenJDK Current, Windows)](https://img.shields.io/github/workflow/status/io7m/jbssio/main-openjdk_current-windows)](https://github.com/io7m/jbssio/actions?query=workflow%3Amain-openjdk_current-windows)

2 changes: 1 addition & 1 deletion com.io7m.jbssio.api/pom.xml
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>com.io7m.jbssio</artifactId>
<groupId>com.io7m.jbssio</groupId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>com.io7m.jbssio.api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.jbssio.tests/pom.xml
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>com.io7m.jbssio</artifactId>
<groupId>com.io7m.jbssio</groupId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>com.io7m.jbssio.tests</artifactId>
Expand Down
Expand Up @@ -17,7 +17,7 @@

package com.io7m.jbssio.tests;

import com.io7m.jbssio.vanilla.BSSRangeHalfOpen;
import com.io7m.jbssio.vanilla.internal.BSSRangeHalfOpen;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion com.io7m.jbssio.vanilla/pom.xml
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>com.io7m.jbssio</artifactId>
<groupId>com.io7m.jbssio</groupId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>com.io7m.jbssio.vanilla</artifactId>
Expand Down
Expand Up @@ -19,14 +19,18 @@
import com.io7m.jbssio.api.BSSReaderProviderType;
import com.io7m.jbssio.api.BSSReaderRandomAccessType;
import com.io7m.jbssio.api.BSSReaderSequentialType;
import com.io7m.jbssio.vanilla.internal.BSSReaderByteBuffer;
import com.io7m.jbssio.vanilla.internal.BSSReaderSeekableChannel;
import com.io7m.jbssio.vanilla.internal.BSSReaderStream;
import org.osgi.service.component.annotations.Component;

import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.SeekableByteChannel;
import java.util.Objects;
import java.util.OptionalLong;
import org.osgi.service.component.annotations.Component;

/**
* A default provider of readers.
Expand Down
Expand Up @@ -19,13 +19,17 @@
import com.io7m.jbssio.api.BSSWriterProviderType;
import com.io7m.jbssio.api.BSSWriterRandomAccessType;
import com.io7m.jbssio.api.BSSWriterSequentialType;
import com.io7m.jbssio.vanilla.internal.BSSWriterByteBuffer;
import com.io7m.jbssio.vanilla.internal.BSSWriterSeekableChannel;
import com.io7m.jbssio.vanilla.internal.BSSWriterStream;
import org.osgi.service.component.annotations.Component;

import java.io.OutputStream;
import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.SeekableByteChannel;
import java.util.Objects;
import java.util.OptionalLong;
import org.osgi.service.component.annotations.Component;

/**
* A default provider of writers.
Expand Down
Expand Up @@ -15,9 +15,10 @@
*/


package com.io7m.jbssio.vanilla;
package com.io7m.jbssio.vanilla.internal;

import com.io7m.jbssio.api.BSSAddressableType;

import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
Expand Down
@@ -0,0 +1,27 @@
/*
* Copyright © 2020 Mark Raynsford <code@io7m.com> http://io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

package com.io7m.jbssio.vanilla.internal;

final class BSSPaths
{
static final char PATH_SEPARATOR = '.';

private BSSPaths()
{

}
}
Expand Up @@ -15,12 +15,15 @@
*/


package com.io7m.jbssio.vanilla;
package com.io7m.jbssio.vanilla.internal;

import com.io7m.jbssio.api.BSSAddressableType;
import com.io7m.jbssio.api.BSSCloseableType;
import com.io7m.jbssio.api.BSSSeekableType;
import com.io7m.jbssio.api.BSSSkippableType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.EOFException;
import java.io.IOException;
import java.net.URI;
Expand All @@ -29,8 +32,6 @@
import java.util.OptionalLong;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

abstract class BSSRandomAccess<T>
implements BSSSeekableType,
Expand Down
Expand Up @@ -14,7 +14,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

package com.io7m.jbssio.vanilla;
package com.io7m.jbssio.vanilla.internal;

import java.util.Objects;
import java.util.OptionalLong;
Expand Down
Expand Up @@ -15,7 +15,7 @@
*/


package com.io7m.jbssio.vanilla;
package com.io7m.jbssio.vanilla.internal;

import java.util.Objects;

Expand Down
Expand Up @@ -14,10 +14,11 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

package com.io7m.jbssio.vanilla;
package com.io7m.jbssio.vanilla.internal;

import com.io7m.ieee754b16.Binary16;
import com.io7m.jbssio.api.BSSReaderRandomAccessType;

import java.io.EOFException;
import java.io.IOException;
import java.net.URI;
Expand All @@ -28,7 +29,10 @@
import java.util.OptionalLong;
import java.util.concurrent.Callable;

final class BSSReaderByteBuffer extends BSSRandomAccess<BSSReaderRandomAccessType>
import static com.io7m.jbssio.vanilla.internal.BSSPaths.PATH_SEPARATOR;

public final class BSSReaderByteBuffer
extends BSSRandomAccess<BSSReaderRandomAccessType>
implements BSSReaderRandomAccessType
{
private final ByteBuffer map;
Expand All @@ -46,10 +50,10 @@ private BSSReaderByteBuffer(
this.map =
Objects.requireNonNull(inMap, "map");
this.physicalBounds =
BSSRangeHalfOpen.create(0L, (long) inMap.capacity());
BSSRangeHalfOpen.create(0L, inMap.capacity());
}

static BSSReaderRandomAccessType createFromByteBuffer(
public static BSSReaderRandomAccessType createFromByteBuffer(
final URI uri,
final ByteBuffer buffer,
final String name)
Expand Down Expand Up @@ -84,7 +88,7 @@ public BSSReaderRandomAccessType createSubReaderAtBounded(
final var newName =
new StringBuilder(32)
.append(this.path)
.append('.')
.append(PATH_SEPARATOR)
.append(inName)
.toString();

Expand Down Expand Up @@ -115,7 +119,7 @@ public BSSReaderRandomAccessType createSubReaderAt(
final var newName =
new StringBuilder(32)
.append(this.path)
.append('.')
.append(PATH_SEPARATOR)
.append(inName)
.toString();

Expand Down Expand Up @@ -148,7 +152,7 @@ private int readS8p(final String name)
final var position = this.offsetCurrentAbsolute();
this.increaseOffsetRelative(1L);
this.map.position(0);
return (int) this.map.get(longPositionTo2GBLimitedByteBufferPosition(
return this.map.get(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand All @@ -173,7 +177,7 @@ private int readS16LEp(final String name)
this.increaseOffsetRelative(2L);
this.map.order(ByteOrder.LITTLE_ENDIAN);
this.map.position(0);
return (int) this.map.getShort(longPositionTo2GBLimitedByteBufferPosition(
return this.map.getShort(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand All @@ -186,7 +190,7 @@ private int readU16LEp(final String name)
this.increaseOffsetRelative(2L);
this.map.order(ByteOrder.LITTLE_ENDIAN);
this.map.position(0);
return (int) this.map.getChar(longPositionTo2GBLimitedByteBufferPosition(
return this.map.getChar(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand All @@ -199,7 +203,7 @@ private long readS32LEp(final String name)
this.increaseOffsetRelative(4L);
this.map.order(ByteOrder.LITTLE_ENDIAN);
this.map.position(0);
return (long) this.map.getInt(longPositionTo2GBLimitedByteBufferPosition(
return this.map.getInt(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand Down Expand Up @@ -249,7 +253,7 @@ private int readS16BEp(final String name)
this.increaseOffsetRelative(2L);
this.map.order(ByteOrder.BIG_ENDIAN);
this.map.position(0);
return (int) this.map.getShort(longPositionTo2GBLimitedByteBufferPosition(
return this.map.getShort(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand All @@ -262,7 +266,7 @@ private int readU16BEp(final String name)
this.increaseOffsetRelative(2L);
this.map.order(ByteOrder.BIG_ENDIAN);
this.map.position(0);
return (int) this.map.getChar(longPositionTo2GBLimitedByteBufferPosition(
return this.map.getChar(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand All @@ -275,7 +279,7 @@ private long readS32BEp(final String name)
this.increaseOffsetRelative(4L);
this.map.order(ByteOrder.BIG_ENDIAN);
this.map.position(0);
return (long) this.map.getInt(longPositionTo2GBLimitedByteBufferPosition(
return this.map.getInt(longPositionTo2GBLimitedByteBufferPosition(
position));
}

Expand Down

0 comments on commit cbb651b

Please sign in to comment.