Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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
# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
# file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
# to you 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
#
# http://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.
wrapperVersion=3.3.2
# 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.
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependency:
<groupId>org.microbean</groupId>
<artifactId>microbean-bean</artifactId>
<!-- Always check https://central.sonatype.com/artifact/org.microbean/microbean-bean for up-to-date available versions. -->
<version>0.0.20</version>
<version>0.0.21</version>
</dependency>
```

Expand Down
50 changes: 43 additions & 7 deletions mvnw

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 48 additions & 8 deletions mvnw.cmd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

<!-- central-publishing-maven-plugin properties -->
<deploymentName>${project.name} v${project.version}</deploymentName>

<!-- Other properties -->
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF8</project.reporting.outputEncoding>
Expand Down Expand Up @@ -130,7 +130,7 @@
<dependency>
<groupId>org.microbean</groupId>
<artifactId>microbean-assign</artifactId>
<version>0.0.9</version>
<version>0.0.10</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -494,7 +494,7 @@
<version>23</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.9.9</version>
<version>3.9.12</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/org/microbean/bean/Bean.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

import java.util.function.Function;

import org.microbean.assign.Aggregate;
import org.microbean.assign.Assignment;
import org.microbean.assign.AttributedElement;
import org.microbean.assign.AttributedType;
import org.microbean.assign.AttributedTypedAggregate;

import static java.lang.constant.ConstantDescs.BSM_INVOKE;

Expand All @@ -49,7 +49,7 @@
*
* @see Id
*/
public final record Bean<I>(Id id, Factory<I> factory) implements AttributedTypedAggregate, Constable, Ranked {
public final record Bean<I>(Id id, Factory<I> factory) implements Aggregate, Constable, Ranked {

/**
* Creates a new {@link Bean}.
Expand All @@ -70,7 +70,7 @@ public final boolean alternate() {
return this.id.alternate();
}

@Override // AttributedTypedAggregate (Aggregate)
@Override // Aggregate
public final SequencedSet<? extends Assignment<?>> assign(final Function<? super AttributedType, ?> r) {
return this.factory.assign(r);
}
Expand Down Expand Up @@ -125,9 +125,4 @@ public final int rank() {
return this.id.rank();
}

@Override // AttributedTypedAggregate (AttributedTyped)
public final AttributedType attributedType() {
return new AttributedType(this.id.types().get(0), this.id.attributes());
}

}